X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=76ab5eb5a3192cd5daa72ceda4dc8fcd936ea7be;hp=aa0e6f6d06c704008292e077bd21bf9e18a43180;hb=637ab36596a6122a4c034d4368d0c98e568bf6de;hpb=081b6cc153b9bec96fa22940b09ba6f82fd12d50

diff --git a/Makefile b/Makefile
index aa0e6f6..76ab5eb 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
@@ -72,7 +81,10 @@ shared: $(realname)
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
-%.o: %.c Makefile errtab.h
+
+# List osl.h in the prerequisites to make sure we generate it before attempting
+# to run the compiler. This matters only when the .d file does not exist.
+%.o: %.c osl.h Makefile errtab.h
 	$(CC) $(OSL_CPPFLAGS) $(CPPFLAGS) \
 		-c -MMD -MF $(*F).d -MT $@ \
 		$(OSL_CFLAGS) $(CFLAGS) $<
@@ -81,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 < $<
 
@@ -93,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