chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo in firmware_helper
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index b04321ff4e44a10b0dbbb9e37c144c32d4a00019..1c1280a7dcddb636d7fa3bb22cb79d4407ac9245 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-41,6
+41,7
@@
EXTRAS=
# make the build silent. Set this to something else to make it noisy again.
V=false
# make the build silent. Set this to something else to make it noisy again.
V=false
+VERSION = 068
ROOT = udev
DAEMON = udevd
SENDER = udevsend
ROOT = udev
DAEMON = udevd
SENDER = udevsend
@@
-48,10
+49,10
@@
COMPILE = udevrulescompile
INITSENDER = udevinitsend
RECORDER = udeveventrecorder
CONTROL = udevcontrol
INITSENDER = udevinitsend
RECORDER = udeveventrecorder
CONTROL = udevcontrol
+MONITOR = udevmonitor
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
-VERSION = 059
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
DESTDIR =
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
DESTDIR =
@@
-63,6
+64,7
@@
exec_prefix = ${prefix}
etcdir = ${prefix}/etc
sbindir = ${exec_prefix}/sbin
usrbindir = ${exec_prefix}/usr/bin
etcdir = ${prefix}/etc
sbindir = ${exec_prefix}/sbin
usrbindir = ${exec_prefix}/usr/bin
+usrsbindir = ${exec_prefix}/usr/sbin
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev
srcdir = .
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev
srcdir = .
@@
-73,7
+75,7
@@
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# place to put our device nodes
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# place to put our device nodes
-udevdir =
${prefix}/u
dev
+udevdir =
/
dev
udevdb = ${udevdir}/.udevdb
# set up PWD so that older versions of make will work with our build.
udevdb = ${udevdir}/.udevdb
# set up PWD so that older versions of make will work with our build.
@@
-102,48
+104,51
@@
GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.
# code taken from uClibc to determine the libgcc.a filename
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
# code taken from uClibc to determine the libgcc.a filename
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
- then echo "-Os"; else echo "-O2" ; fi}
-
# check if compiler option is supported
# check if compiler option is supported
-cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
+cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)";
else echo "$(2)";
fi;}
-CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith
-Wstrict-prototypes -Wsign-compare
-CFLAGS += $(call cc-supports,-Wno-pointer-sign)
-CFLAGS += $(call cc-supports,
-Wdeclaration-after-statement
)
+CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith
\
+ -Wstrict-prototypes -Wsign-compare
+CFLAGS += $(call cc-supports,
-Wdeclaration-after-statement,
)
CFLAGS += -pipe
CFLAGS += -pipe
-CFLAGS += -D_GNU_SOURCE
+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+
+# use '-Os' optimization if available, else use -O2
+OPTFLAGS := $(call cc-supports, -Os, -O2)
HEADERS = \
HEADERS = \
- udev.h \
- udev_utils.h \
- udev_rules.h \
- udev_version.h \
- udev_db.h \
- udev_sysfs.h \
- logging.h \
- udev_libc_wrapper.h \
- udev_selinux.h \
+ udev.h
\
+ udev_utils.h
\
+ udev_rules.h
\
+ udev_version.h
\
+ udev_db.h
\
+ udev_sysfs.h
\
+ logging.h
\
+ udev_libc_wrapper.h
\
+ udev_selinux.h
\
list.h
SYSFS_OBJS = \
list.h
SYSFS_OBJS = \
- libsysfs/sysfs_class.o \
- libsysfs/sysfs_device.o \
- libsysfs/sysfs_dir.o \
- libsysfs/sysfs_driver.o \
- libsysfs/sysfs_utils.o \
+ libsysfs/sysfs_class.o
\
+ libsysfs/sysfs_device.o
\
+ libsysfs/sysfs_dir.o
\
+ libsysfs/sysfs_driver.o
\
+ libsysfs/sysfs_utils.o
\
libsysfs/dlist.o
UDEV_OBJS = \
libsysfs/dlist.o
UDEV_OBJS = \
- udev_utils.o \
- udev_config.o \
- udev_add.o \
- udev_remove.o \
- udev_sysfs.o \
- udev_db.o \
- udev_rules.o \
- udev_rules_parse.o \
+ udev_event.o \
+ udev_device.o \
+ udev_config.o \
+ udev_add.o \
+ udev_remove.o \
+ udev_sysfs.o \
+ udev_db.o \
+ udev_rules.o \
+ udev_rules_parse.o \
+ udev_utils.o \
+ udev_utils_file.o \
+ udev_utils_run.o \
udev_libc_wrapper.o
OBJS = \
udev_libc_wrapper.o
OBJS = \
@@
-152,7
+157,7
@@
OBJS = \
SYSFS = $(PWD)/libsysfs/sysfs.a
SYSFS = $(PWD)/libsysfs/sysfs.a
-CFLAGS += -I$(PWD)/libsysfs/sysfs \
+CFLAGS += -I$(PWD)/libsysfs/sysfs \
-I$(PWD)/libsysfs
ifeq ($(strip $(USE_LOG)),true)
-I$(PWD)/libsysfs
ifeq ($(strip $(USE_LOG)),true)
@@
-165,7
+170,7
@@
ifeq ($(strip $(DEBUG)),true)
LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGS += $(OPT
IMIZATION
) -fomit-frame-pointer
+ CFLAGS += $(OPT
FLAGS
) -fomit-frame-pointer
LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
@@
-174,7
+179,7
@@
endif
# link udev against it statically. Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
KLIBC_INSTALL = $(PWD)/klibc/.install
# link udev against it statically. Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
KLIBC_INSTALL = $(PWD)/klibc/.install
- KLCC = $(KLIBC_INSTALL)/bin/klcc
+ KLCC = $(KLIBC_INSTALL)/bin/
$(CROSS)
klcc
CC = $(KLCC)
LD = $(KLCC)
else
CC = $(KLCC)
LD = $(KLCC)
else
@@
-203,7
+208,7
@@
endif
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
-all: $(ROOT) $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) \
+all: $(ROOT) $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL)
$(MONITOR)
\
$(DAEMON) $(COMPILE) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(DAEMON) $(COMPILE) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@
-274,6
+279,7
@@
$(COMPILE).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(RECORDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(RECORDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(MONITOR).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(STARTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
$(STARTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
@@
-312,6
+318,10
@@
$(CONTROL): $(KLCC) $(CONTROL).o $(OBJS) udevd.h
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
+$(MONITOR): $(KLCC) $(MONITOR).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(MONITOR).o $(OBJS) $(LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
$(STARTER): $(KLCC) $(STARTER).o $(OBJS)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(STARTER): $(KLCC) $(STARTER).o $(OBJS)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
@@
-323,7
+333,7
@@
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
- $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(TESTER) $(STARTER)
+ $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(
MONITOR) $(
TESTER) $(STARTER)
-rm -f ccdv
$(MAKE) -C klibc SUBDIRS=klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
-rm -f ccdv
$(MAKE) -C klibc SUBDIRS=klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@
-347,8
+357,9
@@
install-config:
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
- echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
- $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
+ echo ; \
+ echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
+ echo ; \
fi
install-man:
fi
install-man:
@@
-373,13
+384,14
@@
install: install-config install-man all
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
+ $(INSTALL_PROGRAM) -D $(MONITOR) $(DESTDIR)$(usrsbindir)/$(MONITOR)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
ifndef DESTDIR
- killall $(DAEMON)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
ifndef DESTDIR
- killall $(DAEMON)
- - $(sbindir)/$(DAEMON) --daemon
- rm -rf $(udevdb)
- rm -rf $(udevdb)
+ - $(sbindir)/$(DAEMON) --daemon
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@
-399,6
+411,7
@@
uninstall: uninstall-man
- rm $(sbindir)/$(RECORDER)
- rm $(sbindir)/$(CONTROL)
- rm $(sbindir)/$(STARTER)
- rm $(sbindir)/$(RECORDER)
- rm $(sbindir)/$(CONTROL)
- rm $(sbindir)/$(STARTER)
+ - rm $(usrsbindir)/$(MONITOR)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
- rm -rf $(udevdb)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
- rm -rf $(udevdb)
@@
-413,3
+426,5
@@
uninstall: uninstall-man
test: all
@ cd test && ./udev-test.pl
@ cd test && ./udevstart-test.pl
test: all
@ cd test && ./udev-test.pl
@ cd test && ./udevstart-test.pl
+
+tests: test