[PATCH] klibc_fixups: remove no longer needed stuff

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 052e41acc3f87deea2e0b81a6cdb42eb31fe5796..8184620a2d50c6af5879e4e84ae2c1e68b16018c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      051
+VERSION =      054
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -108,8 +108,12 @@ 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}
 
-# add -Wredundant-decls when libsysfs gets cleaned up
-WARNINGS := -Wall 
+# 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;}
+
+WARNINGS := -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
+WARNINGS += $(call cc-supports,-Wno-pointer-sign)
+WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
 
 CFLAGS := -pipe
 
@@ -125,7 +129,6 @@ HEADERS = \
        list.h
 
 SYSFS_OBJS = \
-       libsysfs/sysfs_bus.o    \
        libsysfs/sysfs_class.o  \
        libsysfs/sysfs_device.o \
        libsysfs/sysfs_dir.o    \
@@ -185,10 +188,9 @@ ifeq ($(strip $(USE_KLIBC)),true)
        CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
        CFLAGS += $(WARNINGS) -nostdinc                         \
-               $(OPTFLAGS)                                     \
+               $(OPTFLAGS) $(REQFLAGS)                         \
                -D__KLIBC__ -fno-builtin-printf                 \
                -I$(KLIBC_FIXUPS_DIR)                           \
-               -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h     \
                -I$(INCLUDE_DIR)                                \
                -I$(INCLUDE_DIR)/arch/$(ARCH)                   \
                -I$(INCLUDE_DIR)/bits$(BITSIZE)                 \
@@ -198,8 +200,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 
        HEADERS += \
-               klibc_fixups/klibc_fixups.h     \
-               klibc_fixups/mntent.h           \
                klibc_fixups/pwd.h
 
        KLIBC_FIXUP_OBJS = \
@@ -354,7 +354,7 @@ release: spotless
        -rm -rf $(DISTDIR)
        mkdir $(DISTDIR)
        chmod 777 $(DISTDIR)
-       bk export $(DISTDIR)
+       bk export -w $(DISTDIR)
        tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
        rm -rf $(DISTDIR)
        @echo "$(RELEASE_NAME).tar.gz created"