X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=48ecbd742864b4aafce8fde24d665f0eacebe96e;hp=8694b917a2cc98d954249810e232aadc53c879b1;hb=face198a5f21027fefe796dc01e19e349a2d36ce;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e

diff --git a/Makefile b/Makefile
index 8694b917a..48ecbd742 100644
--- a/Makefile
+++ b/Makefile
@@ -41,16 +41,17 @@ EXTRAS=
 # make the build silent. Set this to something else to make it noisy again.
 V=false
 
+VERSION =	062
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
+COMPILE =	udevrulescompile
 INITSENDER =	udevinitsend
 RECORDER =	udeveventrecorder
 CONTROL =	udevcontrol
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	058
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
@@ -72,7 +73,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 # place to put our device nodes
-udevdir =	${prefix}/udev
+udevdir =	/dev
 udevdb =	${udevdir}/.udevdb
 
 # set up PWD so that older versions of make will work with our build.
@@ -101,19 +102,18 @@ GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.
 # code taken from uClibc to determine the libgcc.a filename
 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
-		then echo "-Os"; else echo "-O2" ; fi}
-
 # check if compiler option is supported
-cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
+cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
 
 CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
-CFLAGS		+= $(call cc-supports,-Wno-pointer-sign)
-CFLAGS		+= $(call cc-supports,-Wdeclaration-after-statement)
+CFLAGS		+= $(call cc-supports, -Wno-pointer-sign, )
+CFLAGS		+= $(call cc-supports, -Wdeclaration-after-statement, )
 CFLAGS		+= -pipe
 CFLAGS		+= -D_GNU_SOURCE
 
+# use '-Os' optimization if available, else use -O2
+OPTFLAGS := $(call cc-supports, -Os, -O2)
+
 HEADERS = \
 	udev.h			\
 	udev_utils.h		\
@@ -164,7 +164,7 @@ ifeq ($(strip $(DEBUG)),true)
 	LDFLAGS += -Wl
 	STRIPCMD = /bin/true -Since_we_are_debugging
 else
-	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer
+	CFLAGS  += $(OPTFLAGS) -fomit-frame-pointer
 	LDFLAGS += -s -Wl
 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
@@ -173,7 +173,7 @@ endif
 # link udev against it statically. Otherwise, use glibc and link dynamically.
 ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_INSTALL	= $(PWD)/klibc/.install
-	KLCC		= $(KLIBC_INSTALL)/bin/klcc
+	KLCC		= $(KLIBC_INSTALL)/bin/$(CROSS)klcc
 	CC		= $(KLCC)
 	LD		= $(KLCC)
 else
@@ -202,7 +202,8 @@ endif
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
 
-all: $(ROOT) $(SENDER) $(INITSENDER) $(RECORDER) $(CONTROL) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
+all: $(ROOT) $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) \
+	$(DAEMON) $(COMPILE) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) \
@@ -268,6 +269,7 @@ $(TESTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(INFO).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(DAEMON).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(SENDER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(COMPILE).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(RECORDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
@@ -293,6 +295,10 @@ $(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
 
+$(COMPILE): $(KLCC) $(COMPILE).o $(OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(COMPILE).o $(OBJS) $(LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
+
 $(INITSENDER): $(KLCC) $(INITSENDER).o $(OBJS) udevd.h
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(INITSENDER).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
@@ -316,7 +322,7 @@ clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
-	 $(SENDER) $(INITSENDER) $(RECORDER) $(CONTROL) $(TESTER) $(STARTER)
+	 $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(TESTER) $(STARTER)
 	-rm -f ccdv
 	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \