X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=cb097dde5820ac26a9e5ad0fbd03f6e5138566fb;hp=5edc76f81a85e9ddcb3dc1b7592ee2c0bdf03c4f;hb=f5f0c34f6dc32769fd788560ce0d0cac843872b2;hpb=a5e551b996f81709d9f53b2c7434b48ee7f85605

diff --git a/Makefile b/Makefile
index 5edc76f81..cb097dde5 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 079
+VERSION = 081
 
 # set this to make use of syslog
 USE_LOG = true
@@ -43,7 +43,7 @@ USE_STATIC = false
 #  make EXTRAS="extras/<extra1> extras/<extra2>"
 EXTRAS =
 
-# make the build silent. Set this to something else to make it noisy again.
+# make the build silent.
 V = false
 
 PROGRAMS = \
@@ -58,7 +58,6 @@ PROGRAMS = \
 
 HEADERS = \
 	udev.h				\
-	udev_utils.h			\
 	udev_rules.h			\
 	logging.h			\
 	udev_libc_wrapper.h		\
@@ -66,12 +65,12 @@ HEADERS = \
 	list.h
 
 UDEV_OBJS = \
-	udev_event.o			\
 	udev_device.o			\
 	udev_config.o			\
 	udev_add.o			\
 	udev_remove.o			\
 	udev_db.o			\
+	udev_sysfs.o			\
 	udev_rules.o			\
 	udev_rules_parse.o		\
 	udev_utils.o			\
@@ -90,19 +89,6 @@ MAN_PAGES = \
 	udevinfo.8			\
 	udevstart.8
 
-SYSFS_OBJS = \
-	libsysfs/sysfs_class.o		\
-	libsysfs/sysfs_device.o		\
-	libsysfs/sysfs_dir.o		\
-	libsysfs/sysfs_driver.o		\
-	libsysfs/sysfs_utils.o		\
-	libsysfs/dlist.o
-LIBSYSFS = libsysfs/libsysfs.a
-
-# config files automatically generated
-GEN_CONFIGS = \
-	$(LOCAL_CFG_DIR)/udev.conf
-
 GEN_HEADERS = \
 	udev_version.h
 
@@ -115,12 +101,11 @@ libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev
 udevdir =	/dev
-LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 PWD = $(shell pwd)
 
@@ -144,10 +129,6 @@ LDFLAGS = -Wl,-warn-common
 OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
 
-# include our local copy of libsysfs
-CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
-		-I$(PWD)/libsysfs
-
 ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS += -DUSE_LOG
 endif
@@ -163,7 +144,6 @@ ifeq ($(strip $(USE_GCOV)),true)
 	LDFLAGS += -fprofile-arcs
 endif
 
-# if our own version of klibc is used, we need to build it
 ifeq ($(strip $(USE_KLIBC)),true)
 	KLCC		= /usr/bin/$(CROSS)klcc
 	CC		= $(KLCC)
@@ -200,7 +180,6 @@ all: $(PROGRAMS) $(MAN_PAGES)
 			STRIPCMD="$(STRIPCMD)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
-			LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
 			QUIET="$(QUIET)" \
 			-C $$target $@ || exit 1; \
 	done;
@@ -211,36 +190,24 @@ all: $(PROGRAMS) $(MAN_PAGES)
 .SUFFIXES:
 
 # build the objects
-%.o: %.c $(HOST_PROGS) $(GEN_HEADERS)
+%.o: %.c $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 # "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
-	$(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
+	$(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(STRIPCMD),)
 	$(QUIET) $(STRIPCMD) $@
 endif
 
-$(UDEV_OBJS):
 $(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
 	@rm -f $@
 	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
 	$(QUIET) $(RANLIB) $@
 
-$(SYSFS_OBJS):
-$(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS)
-	@rm -f $@
-	$(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
-	$(QUIET) $(RANLIB) $@
-
-# generate config files
-$(GEN_CONFIGS):
-	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $@.in > $@
-
-# generate config header file
 udev_version.h:
-	@echo "Creating udev_version.h"
-	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
+	@echo "/* Generated by make. */" > $@
+	@echo \#define UDEV_VERSION		\"$(VERSION)\" >> $@
 	@echo \#define UDEV_ROOT		\"$(udevdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
@@ -261,8 +228,9 @@ clean:
 	- find -name "*.gcda" -print0 | xargs -0rt rm -f
 	- find -name "*.gcov" -print0 | xargs -0rt rm -f
 	- rm -f udev_gcov.txt
-	- rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS)
+	- rm -f core $(PROGRAMS) $(GEN_HEADERS)
 	- rm -f udev-$(VERSION).tar.gz
+	- rm -f udev-$(VERSION).tar.bz2
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
 		$(MAKE) -C $$target $@ || exit 1; \
@@ -271,14 +239,13 @@ clean:
 
 release:
 	git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz
-	@echo "udev-$(VERSION).tar.gz created"
+	git-tar-tree HEAD udev-$(VERSION) | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
-install-config: $(GEN_CONFIGS)
+install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
 	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
 		echo; \
@@ -349,8 +316,8 @@ uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
 	- rm -f $(DESTDIR)$(sbindir)/udevstart
 	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
-	- rm -f $(usrbindir)/udevinfo
-	- rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
+	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
+	- rm -f $(DESTDIR)$(usrbindir)/udevtest
 ifndef DESTDIR
 	- killall udevd
 	- rm -rf /dev/.udev
@@ -409,4 +376,3 @@ udev_gcov.txt: $(wildcard *.gcda) $(wildcard *.gcno)
 		echo >> $@; \
 	done; \
 	echo "view $@ for the result"
-