X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=98f2a1f4348e381daac01cdd91e47c7eb9fd73d6;hp=d8d2ec0d7baea7bba48905a57132456e513daa7a;hb=3836a3c49a72b9ee0b092725628f30839f100c4f;hpb=bfd8a5d0f7361b6cb396eee7cdd686138ecd2066

diff --git a/Makefile b/Makefile
index d8d2ec0d7..98f2a1f43 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-DEBUG = true
+DEBUG = false
 
 
 ROOT =		udev
@@ -124,7 +124,7 @@ ifeq ($(strip $(KLIBC)),true)
 		-I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -Iklibc/linux/include \
 		-D__KLIBC__
 	LIB_OBJS =
-	LDFLAGS = --static --nostdlib -nostartfiles
+	LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 else
 	CRT0 =
 	LIBC = 
@@ -154,11 +154,13 @@ SYSFS =	libsysfs/sysfs_bus.o	\
 	libsysfs/dlist.o
 
 OBJS =	udev.o		\
+	udev_config.o	\
 	udev-add.o	\
 	udev-remove.o	\
 	udevdb.o	\
 	logging.o	\
 	namedev.o	\
+	namedev_parse.o	\
 	$(SYSFS)	\
 	$(TDB)
 
@@ -172,8 +174,12 @@ GEN_HEADERS =	udev_version.h
 # Rules on how to create the generated header files
 udev_version.h:
 	@echo \#define UDEV_VERSION	\"$(VERSION)\" > $@
-	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
 	@echo \#define UDEV_ROOT	\"$(udevdir)\" >> $@
+	@echo \#define UDEV_DB		\"$(udevdir)\.udev.tdb\" >> $@
+	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
+	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
+	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
+	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
 
 $(OBJS): $(GEN_HEADERS)
 
@@ -225,7 +231,8 @@ install: all
 	$(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.conf $(DESTDIR)$(configdir)
+	$(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
 	$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -233,7 +240,8 @@ install: all
 uninstall:
 	- rm $(hotplugdir)/udev.hotplug
 	- rm $(configdir)/udev.permissions
-	- rm $(configdir)/udev.config
+	- rm $(configdir)/udev.rules
+	- rm $(configdir)/udev.conf
 	- rm $(mandir)/man8/udev.8
 	- rm $(sbindir)/$(ROOT)
 	- rmdir $(hotplugdir)