[PATCH] implement printf-like placeholder support for NAME

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index a5c00b7191dd93a0063d3a12af93524fe5d8cc3c..01536f698693c5e28b41927c9b42f3d26a4a74bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,11 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      004_bk
+VERSION =      005_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
+DESTDIR =
 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =  ${prefix}
@@ -106,34 +107,43 @@ endif
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
 ifeq ($(strip $(KLIBC)),true)
-       KLIBC_DIR       = klibc
+       KLIBC_DIR       = klibc/klibc
        INCLUDE_DIR     := $(KLIBC_DIR)/include
        # arch specific objects
+       LIBGCC          = $(shell $(CC) --print-libgcc)
        ARCH_LIB_OBJS = \
-                       $(KLIBC_DIR)/bin-$(ARCH)/start.o        \
-                       $(KLIBC_DIR)/bin-$(ARCH)/klibc.a
+                       $(KLIBC_DIR)/libc.a     \
+                       $(LIBGCC)
 
-       LIB_OBJS =      $(GCC_LIB)
 
+       CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)
-       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+       LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles
 else
+       CRT0 =
        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LDFLAGS = --static 
 endif
 
-LIB=libsysfs
-
 all: $(LIBC) $(ROOT)
 
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
-LIBSYSFS = libsysfs/libsysfs.a
-TDB = tdb/tdb.o tdb/spinlock.o
+TDB =  tdb/tdb.o       \
+       tdb/spinlock.o
+
+SYSFS =        libsysfs/sysfs_bus.o    \
+       libsysfs/sysfs_class.o  \
+       libsysfs/sysfs_device.o \
+       libsysfs/sysfs_dir.o    \
+       libsysfs/sysfs_driver.o \
+       libsysfs/sysfs_utils.o  \
+       libsysfs/dlist.o
 
 OBJS = udev.o          \
        udev-add.o      \
@@ -141,14 +151,10 @@ OBJS =    udev.o          \
        udevdb.o        \
        logging.o       \
        namedev.o       \
+       klibc_fixups.o  \
+       $(SYSFS)        \
        $(TDB)
 
-libsysfs/libsysfs.a:
-       $(MAKE) -C libsysfs
-
-tdb/tdb.o:
-       $(MAKE) -C tdb
-
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 
@@ -159,9 +165,8 @@ udev_version.h:
        @echo \#define UDEV_ROOT        \"$(udevdir)\" >> $@
 
 
-$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
-       $(MAKE) -C libsysfs
-       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
+$(ROOT): $(GEN_HEADERS) $(OBJS)
+       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
 clean:
@@ -169,10 +174,8 @@ clean:
         | xargs rm -f 
        -rm -f core $(ROOT) $(GEN_HEADERS)
        $(MAKE) -C klibc clean
-       $(MAKE) -C libsysfs clean
-       $(MAKE) -C tdb 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 | grep -v "\.tdb" | sort )
+DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: $(DISTFILES) clean
@@ -193,14 +196,14 @@ release: $(DISTFILES) clean
 
 
 install: all
-       $(INSTALL) -d $(udevdir)
-       $(INSTALL) -d $(configdir)
-       $(INSTALL) -d $(hotplugdir)
-       $(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
-       $(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
-       $(INSTALL_DATA) udev.config $(configdir)
-       $(INSTALL_DATA) udev.permissions $(configdir)
-       - ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+       $(INSTALL) -d $(DESTDIR)$(udevdir)
+       $(INSTALL) -d $(DESTDIR)$(configdir)
+       $(INSTALL) -d $(DESTDIR)$(hotplugdir)
+       $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+       $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+       $(INSTALL_DATA) udev.config $(DESTDIR)$(configdir)
+       $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
+       - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall:
        - rm $(hotplugdir)/udev.hotplug