081 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 774d5e154a9cdf2a11268c2dca8f9655de3c4cd1..bb4f6d42391d46e44fe3598ef41692758e8041db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 077
+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
@@ -144,10 +134,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
@@ -200,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;
@@ -211,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 > $@
@@ -255,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