X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=c6f322c8808b8ec75d09f62d705a6c4f40894f6b;hb=1bed1db4994aae37f4a11e90dabcd8b4e3592686;hp=67d38c04126d3a82c8941c0ecf6b82aa02bc7029;hpb=7f2ea6a38223b02d38406baf1843f4ee1349abcf;p=elogind.git

diff --git a/Makefile b/Makefile
index 67d38c041..c6f322c88 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-DEBUG = true
+DEBUG = false
 
 
 ROOT =		udev
-VERSION =	007_bk
+VERSION =	008_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
@@ -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)