chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
062 release
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 665f75a29ee28070592b6874efc8b3954a0453e4..48ecbd742864b4aafce8fde24d665f0eacebe96e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-41,6
+41,7
@@
EXTRAS=
# make the build silent. Set this to something else to make it noisy again.
V=false
# make the build silent. Set this to something else to make it noisy again.
V=false
+VERSION = 062
ROOT = udev
DAEMON = udevd
SENDER = udevsend
ROOT = udev
DAEMON = udevd
SENDER = udevsend
@@
-51,7
+52,6
@@
CONTROL = udevcontrol
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
-VERSION = 059
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
DESTDIR =
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
DESTDIR =
@@
-73,7
+73,7
@@
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# place to put our device nodes
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# place to put our device nodes
-udevdir =
${prefix}/u
dev
+udevdir =
/
dev
udevdb = ${udevdir}/.udevdb
# set up PWD so that older versions of make will work with our build.
udevdb = ${udevdir}/.udevdb
# set up PWD so that older versions of make will work with our build.
@@
-102,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 )
# 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
# 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 += -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
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 \
HEADERS = \
udev.h \
udev_utils.h \
@@
-165,7
+164,7
@@
ifeq ($(strip $(DEBUG)),true)
LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGS += $(OPT
IMIZATION
) -fomit-frame-pointer
+ CFLAGS += $(OPT
FLAGS
) -fomit-frame-pointer
LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif