X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=5995b576970f8469ae7e8bfc77aa8c08e7c6fee6;hp=8d280acd487aade451af3da99332df9d0c44f512;hb=a2f87fddbfcb81f6f8f254b1a986a18f444212cf;hpb=1ad45a47cae79a80bb9c9ff287dc46c18b2ddc71 diff --git a/Makefile b/Makefile index 8d280acd4..5995b5769 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 072 +VERSION = 076 # set this to make use of syslog USE_LOG = true @@ -50,8 +50,6 @@ PROGRAMS = \ udev \ udevd \ udevsend \ - udevinitsend \ - udeveventrecorder \ udevcontrol \ udevmonitor \ udevinfo \ @@ -62,8 +60,6 @@ HEADERS = \ udev.h \ udev_utils.h \ udev_rules.h \ - udev_db.h \ - udev_sysfs.h \ logging.h \ udev_libc_wrapper.h \ udev_selinux.h \ @@ -75,7 +71,6 @@ UDEV_OBJS = \ udev_config.o \ udev_add.o \ udev_remove.o \ - udev_sysfs.o \ udev_db.o \ udev_rules.o \ udev_rules_parse.o \ @@ -111,19 +106,16 @@ GEN_CONFIGS = \ GEN_HEADERS = \ udev_version.h -# override this to make udev look in a different location for it's config files prefix = -exec_prefix = ${prefix} etcdir = ${prefix}/etc -sbindir = ${exec_prefix}/sbin -usrbindir = ${exec_prefix}/usr/bin -usrsbindir = ${exec_prefix}/usr/sbin +sbindir = ${prefix}/sbin +usrbindir = ${prefix}/usr/bin +usrsbindir = ${prefix}/usr/sbin +libudevdir = ${prefix}/lib/udev mandir = ${prefix}/usr/share/man configdir = ${etcdir}/udev udevdir = /dev -udevdb = ${udevdir}/.udevdb LOCAL_CFG_DIR = etc/udev -KERNEL_DIR = /lib/modules/${shell uname -r}/build DESTDIR = INSTALL = /usr/bin/install -c @@ -178,8 +170,7 @@ endif # if our own version of klibc is used, we need to build it ifeq ($(strip $(USE_KLIBC)),true) - KLIBC_INSTALL = $(PWD)/klibc/.install - KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc + KLCC = /usr/bin/$(CROSS)klcc CC = $(KLCC) LD = $(KLCC) V = true @@ -204,7 +195,7 @@ else HOST_PROGS= endif -all: $(KLCC) $(PROGRAMS) $(MAN_PAGES) +all: $(PROGRAMS) $(MAN_PAGES) @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ $(MAKE) CC="$(CC)" \ @@ -215,9 +206,8 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES) LIB_OBJS="$(LIB_OBJS)" \ LIBUDEV="$(PWD)/$(LIBUDEV)" \ LIBSYSFS="$(PWD)/$(LIBSYSFS)" \ - KERNEL_DIR="$(KERNEL_DIR)" \ QUIET="$(QUIET)" \ - -C $$target $@; \ + -C $$target $@ || exit 1; \ done; .PHONY: all .DEFAULT: all @@ -230,28 +220,19 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES) $(QUIET) $(CC) -c $(CFLAGS) $< -o $@ # "Static Pattern Rule" to build all programs -$(PROGRAMS): %: $(HOST_PROGS) $(KLCC) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o +$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS) ifneq ($(STRIPCMD),) $(QUIET) $(STRIPCMD) $@ endif -# our own copy of klibc, it is not used if KLCC is given -$(KLCC): - $(MAKE) -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \ - SHLIBDIR=$(KLIBC_INSTALL)/lib \ - INSTALLDIR=$(KLIBC_INSTALL) \ - bindir=$(KLIBC_INSTALL)/bin \ - mandir=$(KLIBC_INSTALL)/man all install -.NOTPARALLEL: $(KLCC) - -$(UDEV_OBJS): $(KLCC) +$(UDEV_OBJS): $(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS) @rm -f $@ $(QUIET) $(AR) cq $@ $(UDEV_OBJS) $(QUIET) $(RANLIB) $@ -$(SYSFS_OBJS): $(KLCC) +$(SYSFS_OBJS): $(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS) @rm -f $@ $(QUIET) $(AR) cq $@ $(SYSFS_OBJS) @@ -266,12 +247,8 @@ udev_version.h: @echo "Creating udev_version.h" @echo \#define UDEV_VERSION \"$(VERSION)\" > $@ @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ - @echo \#define UDEV_DB \"$(udevdb)\" >> $@ - @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@ @echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@ @echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@ - @echo \#define UDEV_BIN \"$(sbindir)/udev\" >> $@ - @echo \#define UDEVD_BIN \"$(sbindir)/udevd\" >> $@ # man pages %.8: docs/%.xml @@ -290,13 +267,10 @@ clean: - rm -f udev_gcov.txt - rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS) - rm -f udev-$(VERSION).tar.gz - $(MAKE) -C klibc SUBDIRS=klibc clean @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; - $(MAKE) -C klibc SUBDIRS=klibc spotless - rm -rf klibc/.install .PHONY: clean release: @@ -317,7 +291,7 @@ install-config: $(GEN_CONFIGS) fi @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: install-config @@ -332,7 +306,7 @@ install-man: - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8 @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: install-man @@ -347,7 +321,7 @@ uninstall-man: - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8 @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: uninstall-man @@ -363,11 +337,11 @@ install-bin: $(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; ifndef DESTDIR - killall udevd - - rm -rf $(udevdb) + - rm -rf /dev/.udev - $(sbindir)/udevd --daemon endif .PHONY: install-bin @@ -376,8 +350,6 @@ uninstall-bin: - rm -f $(DESTDIR)$(sbindir)/udev - rm -f $(DESTDIR)$(sbindir)/udevd - rm -f $(DESTDIR)$(sbindir)/udevsend - - rm -f $(DESTDIR)$(sbindir)/udevinitsend - - rm -f $(DESTDIR)$(sbindir)/udeveventrecoreder - rm -f $(DESTDIR)$(sbindir)/udevcontrol - rm -f $(DESTDIR)$(sbindir)/udevstart - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor @@ -385,11 +357,11 @@ uninstall-bin: - rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest ifndef DESTDIR - killall udevd - - rm -rf $(udevdb) + - rm -rf /dev/.udev endif @extras="$(EXTRAS)"; for target in $$extras; do \ echo $$target; \ - $(MAKE) -C $$target $@; \ + $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: uninstall-bin