chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevtrigger: fix pattern match
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 1ce1abeab453d3532a0292bcc76eeb88185eca29..0027421d0124d089e18d98be98f26f3ef0fede5b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,5
@@
-# Makefile for udev
#
#
-# Copyright (C) 2003
,
2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003
-
2004 Greg Kroah-Hartman <greg@kroah.com>
# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
@@
-14,10
+13,10
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-#
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#
-VERSION = 0
89
+VERSION = 0
98
# set this to make use of syslog
USE_LOG = true
# set this to make use of syslog
USE_LOG = true
@@
-33,9
+32,6
@@
USE_GCOV = false
# include Security-Enhanced Linux support
USE_SELINUX = false
# include Security-Enhanced Linux support
USE_SELINUX = false
-# comile with klibc instead of glibc
-USE_KLIBC = false
-
# set this to create statically linked binaries
USE_STATIC = false
# set this to create statically linked binaries
USE_STATIC = false
@@
-51,7
+47,6
@@
PROGRAMS = \
udevd \
udevtrigger \
udevsettle \
udevd \
udevtrigger \
udevsettle \
- udevsend \
udevcontrol \
udevmonitor \
udevinfo \
udevcontrol \
udevmonitor \
udevinfo \
@@
-60,17
+55,17
@@
PROGRAMS = \
HEADERS = \
udev.h \
HEADERS = \
udev.h \
+ udevd.h \
udev_rules.h \
logging.h \
udev_rules.h \
logging.h \
- udev_
libc_wrapper.h
\
+ udev_
sysdeps.h
\
udev_selinux.h \
list.h
UDEV_OBJS = \
udev_device.o \
udev_config.o \
udev_selinux.h \
list.h
UDEV_OBJS = \
udev_device.o \
udev_config.o \
- udev_add.o \
- udev_remove.o \
+ udev_node.o \
udev_db.o \
udev_sysfs.o \
udev_rules.o \
udev_db.o \
udev_sysfs.o \
udev_rules.o \
@@
-79,7
+74,7
@@
UDEV_OBJS = \
udev_utils_string.o \
udev_utils_file.o \
udev_utils_run.o \
udev_utils_string.o \
udev_utils_file.o \
udev_utils_run.o \
- udev_
libc_wrapper
.o
+ udev_
sysdeps
.o
LIBUDEV = libudev.a
MAN_PAGES = \
LIBUDEV = libudev.a
MAN_PAGES = \
@@
-88,7
+83,6
@@
MAN_PAGES = \
udevd.8 \
udevtrigger.8 \
udevsettle.8 \
udevd.8 \
udevtrigger.8 \
udevsettle.8 \
- udevsend.8 \
udevtest.8 \
udevinfo.8 \
udevstart.8
udevtest.8 \
udevinfo.8 \
udevstart.8
@@
-96,7
+90,7
@@
MAN_PAGES = \
GEN_HEADERS = \
udev_version.h
GEN_HEADERS = \
udev_version.h
-prefix =
+prefix
?
=
etcdir = ${prefix}/etc
sbindir = ${prefix}/sbin
usrbindir = ${prefix}/usr/bin
etcdir = ${prefix}/etc
sbindir = ${prefix}/sbin
usrbindir = ${prefix}/usr/bin
@@
-113,7
+107,7
@@
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
PWD = $(shell pwd)
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
PWD = $(shell pwd)
-CROSS_COMPILE =
+CROSS_COMPILE
?
=
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
@@
-144,12
+138,6
@@
ifeq ($(strip $(USE_GCOV)),true)
LDFLAGS += -fprofile-arcs
endif
LDFLAGS += -fprofile-arcs
endif
-ifeq ($(strip $(USE_KLIBC)),true)
- KLCC = /usr/bin/$(CROSS_COMPILE)klcc
- CC = $(KLCC)
- LD = $(KLCC)
-endif
-
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
LIB_OBJS += -lselinux -lsepol
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
LIB_OBJS += -lselinux -lsepol