X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=bb4f6d42391d46e44fe3598ef41692758e8041db;hp=d4ee3eb6be1401fb26b23cb4284fdb36b88af1fc;hb=7155bfb7fa7d72bc4e7341ad1481ffd4c6e39f97;hpb=ed0e3cbd6dfe49c2cceb26eb65466dd5905b1c5b

diff --git a/Makefile b/Makefile
index d4ee3eb6b..bb4f6d423 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 076
+VERSION = 081
 
 # set this to make use of syslog
 USE_LOG = true
@@ -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,15 +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
@@ -133,26 +123,17 @@ HOSTCC = gcc
 STRIP = $(CROSS)strip
 STRIPCMD = $(STRIP) -s
 
-# 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)"; else echo "$(2)"; fi;}
-
 CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
-WARNINGS	+= $(call cc-supports, -Wdeclaration-after-statement, )
 CFLAGS		+= $(WARNINGS)
 
 LDFLAGS = -Wl,-warn-common
 
-# use -Os optimization if available, else use -O2
-OPTFLAGS := $(call cc-supports, -Os, -O2)
+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
@@ -205,7 +186,6 @@ all: $(PROGRAMS) $(MAN_PAGES)
 			STRIPCMD="$(STRIPCMD)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
-			LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
 			QUIET="$(QUIET)" \
 			-C $$target $@ || exit 1; \
 	done;
@@ -216,28 +196,21 @@ all: $(PROGRAMS) $(MAN_PAGES)
 .SUFFIXES:
 
 # build the objects
-%.o: %.c $(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 > $@
@@ -260,6 +233,7 @@ ccdv: ccdv.c
 .SILENT: ccdv
 
 clean:
+	- rm -f $(HOST_PROGS)
 	- find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print0 | xargs -0rt rm -f
 	- find -name "*.gcno" -print0 | xargs -0rt rm -f
 	- find -name "*.gcda" -print0 | xargs -0rt rm -f
@@ -382,9 +356,10 @@ buildtest:
 
 ChangeLog: Makefile
 	@ mv $@ $@.tmp
-	@ echo "Summary of changes from v$(VERSION) to v$(shell printf '%03i' $$(expr $(VERSION) + 1))" >> $@
+	@ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
 	@ echo "============================================" >> $@
-	@ git log --pretty=short $(VERSION)..HEAD | git shortlog  >> $@
+	@ echo >> $@
+	@ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog  >> $@
 	@ echo >> $@
 	@ cat $@
 	@ cat $@.tmp >> $@