[PATCH] split udev main logic into udev-add and udev-remove.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index c73ee42a3efb64bbf2f0b010f7e1a81addf3279a..989eb403bf4023821c06483d37b3145ea5514748 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,13 @@
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-DEBUG = false
+DEBUG = true
 
 
 ROOT =         udev
-#PREFIX =      diet
-VERSION =      0.01
+VERSION =      0.1
 INSTALL_DIR =  /usr/local/bin
-RELEASE_NAME = $(PREFIX)$(ROOT)-$(VERSION)
+RELEASE_NAME = $(ROOT)-$(VERSION)
 
 
 # Comment out this line to build with something other 
@@ -105,14 +104,23 @@ else
        LDFLAGS = --static 
 endif
 
+LIB=libsysfs
+
 all: $(LIBC) $(ROOT)
 
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
 OBJS = udev.o          \
-       logging.o
+       udev-add.o      \
+       udev-remove.o   \
+       logging.o       \
+       namedev.o
+
+LIBSYSFS = libsysfs/libsysfs.a
 
+libsysfs/libsysfs.a:
+       $(MAKE) -C libsysfs
 
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
@@ -122,8 +130,9 @@ udev_version.h:
        @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
 
 
-$(ROOT): $(GEN_HEADERS) $(OBJS)
-       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS)
+       $(MAKE) -C libsysfs
+       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
 clean:
@@ -131,6 +140,7 @@ clean:
         | xargs rm -f 
        -rm -f core $(ROOT) $(GEN_HEADERS)
        $(MAKE) -C klibc clean
+       $(MAKE) -C libsysfs clean
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS )
 DISTDIR := $(RELEASE_NAME)