Activate -Wsign-compare.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index d0427c6aef05d21b7752832c6ae282268d9f90f4..bdf78a2728ab67eb4a7a6096f46132663570437f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,12 @@
+# Implicit rules are implemented in make as suffix rules. The following rule
+# empties the suffix list to disable the predefined implicit rules. This
+# increases performance and avoids hard-to-debug behaviour.
+.SUFFIXES:
+MAKEFLAGS += -Rr
+ifeq ("$(origin CC)", "default")
+       CC := cc
+endif
+
 # where to install
 PREFIX ?= /usr/local
 libdir := $(PREFIX)/lib
@@ -30,7 +39,7 @@ VERSION := $(x).$(y).$(z)
 
 OSL_CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
 
-OSL_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+OSL_CFLAGS += -g -Wunused -Wundef -W
 OSL_CFLAGS += -Wredundant-decls
 OSL_CFLAGS += -Os
 OSL_CFLAGS += -Wall
@@ -84,6 +93,7 @@ fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
        $(CC) -o $@ $(fsck_objects) $(LDFLAGS) -llopsub
 
+.PRECIOUS: %.lsg.h %.lsg.c
 %.lsg.c: %.suite
        lopsubgen --gen-c < $<
 
@@ -96,32 +106,22 @@ oslfsck: $(fsck_objects)
 $(realname): $(objects)
        $(CC) $(OSL_LDFLAGS) $(LDFLAGS) -o $@ $(objects)
 
-$(libname).sym: osl.h.in
-       sed -Ene '/^int|^const/{s/.*(osl_.*)\(.*/\1/; p;}' $< > $@
-$(libname).ga: $(objects)
-       $(LD) -r -o $@ $(objects)
-lib$(libname).a: $(libname).ga $(libname).sym
-       $(OBJCOPY) --keep-global-symbols $(libname).sym $(libname).ga $@
-
-osl_errors.h: errlist
-       echo '/** public error codes of the osl library. */' > $@
-       sed -e 's/\([A-Z_]*\)   .*/     E_OSL_\1/' \
-               -e '1s/^/enum osl_errors {/1' \
-               -e '1s/$$/=1/1' \
-               -e '$$!s/$$/,/g' \
-               -e '$$s/$$/};/1' $< >> $@
-
 errtab.h: errlist
        sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in osl_errors.h Makefile
+osl.h: osl.h.in errlist Makefile
        echo '#ifndef _OSL_H' > $@
        echo '#define _OSL_H' >> $@
-       cat osl.h.in osl_errors.h >> $@
+       cat osl.h.in >> $@
+       echo '/** public error codes of the osl library. */' >> $@
+       sed -e 's/\([A-Z_]*\)   .*/     E_OSL_\1/' \
+               -e '1s/^/enum osl_errors {/1' \
+               -e '1s/$$/=1/1' \
+               -e '$$!s/$$/,/g' \
+               -e '$$s/$$/};/1' errlist >> $@
        echo '#endif /* _OSL_H */' >> $@
 clean:
-       rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
-               oslfsck *.a *.ga *.sym *.lsg.* *.d
+       rm -f *.o $(realname) osl.h errtab.h oslfsck *.lsg.* *.d
 
 distclean: clean
        rm -f web/index.html web/oslfsck.1.html web/osl.png