X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=a55273844f9106911dc032a928b7bea7ad732cfa;hp=db345b43a90a242501fba9557dc3872e1e56ccfe;hb=e859b0a68ed9c523a4d9b8f2a0bd31f85ab511d5;hpb=3264f6adc8c15bef4ab19a9fc60ea5568fd3c1e4

diff --git a/Makefile b/Makefile
index db345b4..a552738 100644
--- a/Makefile
+++ b/Makefile
@@ -66,13 +66,16 @@ realname := $(soname).$(y).$(z)
 # soname without any version number.
 linkername := lib$(libname).so
 
-all: $(realname) $(executables) $(man_pages)
+all: $(realname) $(executables) $(man_pages) $(headers)
 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) $<
@@ -93,32 +96,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