summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-10-22 22:30:50 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:06:22 -0700
commitbb27dd9b6d6ace3594e0e2d94c7642c40db0003e (patch)
tree05361660c6a8fc97f70c0324834a166280bd4c1e
parent5c75a3ecd1852abaf4d9ee67a37ee56b0cf0a6d3 (diff)
downloadsystemd-bb27dd9b6d6ace3594e0e2d94c7642c40db0003e.tar.gz
[PATCH] klibc makefile changes.
-rw-r--r--Makefile.klibc53
1 files changed, 46 insertions, 7 deletions
diff --git a/Makefile.klibc b/Makefile.klibc
index d196d6f547..d679ba900b 100644
--- a/Makefile.klibc
+++ b/Makefile.klibc
@@ -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.1
+VERSION = 004_bk
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/' \
@@ -54,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)
@@ -109,22 +130,38 @@ 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
+
OBJS = udev.o \
+ udev-add.o \
+ udev-remove.o \
+ udevdb.o \
logging.o \
- namedev.o
+ 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)
@@ -137,8 +174,10 @@ 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 )
+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