X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6dbbb71dacb1f5a40a26fce272c7cef899a6bb19;hb=a52a0604fa0a069439f346215171e03067508695;hp=4ba28b1fabe4abc97a99c71b60b5372f3dce9597;hpb=2eb6c21822c7b5cc96ab4817d30be6ca2a0f8d5a;p=osl.git

diff --git a/Makefile b/Makefile
index 4ba28b1..6dbbb71 100644
--- 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
@@ -5,8 +14,8 @@ includedir := $(PREFIX)/include
 bindir := $(PREFIX)/bin
 mandir := $(PREFIX)/man/man1
 
-objects := osl.o util.o rbtree.o sha1.o
-fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
+objects := osl.o util.o rbtree.o sha1.o sha3.o sha256.o
+fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o sha3.o sha256.o oslfsck.lsg.o
 deps := $(sort $(objects:.o=.d) $(fsck_objects:.o=.d))
 headers := osl.h
 executables := oslfsck
@@ -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,13 +106,6 @@ 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 $@
-
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
@@ -118,7 +121,7 @@ osl.h: osl.h.in errlist Makefile
 		-e '$$s/$$/};/1' errlist >> $@
 	echo '#endif /* _OSL_H */' >> $@
 clean:
-	rm -f *.o $(realname) osl.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