X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=82ea0bc309214713fea08ed0e6d79797f0a0526e;hp=92b3dc7465e80cc7d34a68efdc8dc212459ddd6d;hb=6ea7aa72dd894e723aef8881bd55766914cb07ed;hpb=6739707df53097ac378f8ff2f0aa694257e31da1

diff --git a/Makefile b/Makefile
index 92b3dc746..82ea0bc30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for diethotplug
+# Makefile for udev
 #
-# Copyright (C) 2000,2001 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003  Greg Kroah-Hartman <greg@kroah.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,16 +22,28 @@ DEBUG = true
 
 
 ROOT =		udev
-VERSION =	003
+VERSION =	005
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
 # override this to make udev look in a different location for it's config files
-PREFIX =
-CONFIG_DIR = $(PREFIX)/etc/udev/
+prefix =
+exec_prefix =	${prefix}
+etcdir =	${prefix}/etc
+sbindir =	${exec_prefix}/sbin
+mandir =	${prefix}/usr/share/man
+hotplugdir =	${etcdir}/hotplug.d/default
+configdir =	${etcdir}/udev/
+srcdir = .
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+
 
 # place to put our device nodes
-UDEV_DIR = /udev/
+udevdir = ${prefix}/udev/
 
 # Comment out this line to build with something other 
 # than the local version of klibc
@@ -62,7 +74,8 @@ GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
 		then echo "-Os"; else echo "-O2" ; fi}
 
-WARNINGS := -Wall -Wshadow -Wstrict-prototypes 
+# add -Wredundant-decls when libsysfs gets cleaned up
+WARNINGS := -Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 
 # Some nice architecture specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),arm)
@@ -112,15 +125,21 @@ else
 	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	\
@@ -128,27 +147,22 @@ 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
 
 # Rules on how to create the generated header files
 udev_version.h:
 	@echo \#define UDEV_VERSION	\"$(VERSION)\" > $@
-	@echo \#define UDEV_CONFIG_DIR	\"$(CONFIG_DIR)\" >> $@
-	@echo \#define UDEV_ROOT	\"$(UDEV_DIR)\" >> $@
+	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
+	@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:
@@ -156,10 +170,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" )
+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
@@ -177,3 +189,26 @@ release: $(DISTFILES) clean
 	@tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
 	@rm -rf $(DISTDIR)
 	@echo "Built $(RELEASE_NAME).tar.gz"
+
+
+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
+
+uninstall:
+	- rm $(hotplugdir)/udev.hotplug
+	- rm $(configdir)/udev.permissions
+	- rm $(configdir)/udev.config
+	- rm $(mandir)/man8/udev.8
+	- rm $(sbindir)/$(ROOT)
+	- rmdir $(hotplugdir)
+	- rmdir $(configdir)
+	- rmdir $(udevdir)
+
+