[PATCH] 004 changelog entrys

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index b1adf3456c676dc29933591dfbffed2df0a731bc..7f8e689b933cb3c43ec9bf7b3a239f6a493cefed 100644 (file)
--- 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,10 +22,28 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      0.2
+VERSION =      004
 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 =
+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
+udevdir = ${prefix}/udev/
 
 # Comment out this line to build with something other 
 # than the local version of klibc
@@ -38,7 +56,9 @@ CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 CC = $(CROSS)gcc
 AR = $(CROSS)ar
 STRIP = $(CROSS)strip
+RANLIB = $(CROSS)ranlib
 
+export CROSS CC AR STRIP RANLIB
 
 # code taken from uClibc to determine the current arch
 ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
@@ -111,26 +131,34 @@ all: $(LIBC) $(ROOT)
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
+LIBSYSFS = libsysfs/libsysfs.a
+TDB = tdb/tdb.o tdb/spinlock.o
+
 OBJS = udev.o          \
        udev-add.o      \
        udev-remove.o   \
+       udevdb.o        \
        logging.o       \
-       namedev.o
-
-LIBSYSFS = libsysfs/libsysfs.a
+       namedev.o       \
+       $(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_VERSION     \"$(VERSION)\" > $@
+       @echo \#define UDEV_CONFIG_DIR  \"$(configdir)\" >> $@
+       @echo \#define UDEV_ROOT        \"$(udevdir)\" >> $@
 
 
-$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS)
+$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
        $(MAKE) -C libsysfs
        $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
@@ -141,8 +169,9 @@ clean:
        -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 )
+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 )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: $(DISTFILES) clean
@@ -160,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) namedev.config $(configdir)
+       $(INSTALL_DATA) namedev.permissions $(configdir)
+       - ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+
+uninstall:
+       - rm $(hotplugdir)/udev.hotplug
+       - rm $(configdir)/namedev.permissions
+       - rm $(configdir)/namedev.config
+       - rm $(mandir)/man8/udev.8
+       - rm $(sbindir)/$(ROOT)
+       - rmdir $(hotplugdir)
+       - rmdir $(configdir)
+       - rmdir $(udevdir)
+
+