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

diff --git a/Makefile b/Makefile
index c52eaea..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
@@ -14,7 +23,7 @@ man_pages := oslfsck.1
 
 INSTALL := install
 ifeq "$(origin CC)" "default"
-        CC := gcc
+        CC := cc
 endif
 MKDIR := mkdir -p
 RM := rm -f
@@ -23,109 +32,68 @@ LD := ld
 OBJCOPY := objcopy
 
 # libosl's versioning consists of three numbers. Let's call them x, y and z.
-# The way x, y and z are interpreted depends on the OS.
 x := 0
 y := 1
 z := 3
 VERSION := $(x).$(y).$(z)
 
-# common flags
-CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
-
-CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-CFLAGS += -Wredundant-decls
-CFLAGS += -Os
-CFLAGS += -Wall
-CFLAGS += -Wuninitialized
-CFLAGS += -Wchar-subscripts
-CFLAGS += -Wformat-security
-CFLAGS += -Werror-implicit-function-declaration
-CFLAGS += -Wmissing-format-attribute
-CFLAGS += -Wunused-macros
-CFLAGS += -Wbad-function-cast
-
-# cflags used only for building library objects
-LIBCFLAGS += -fPIC
-LIBCFLAGS += -fvisibility=hidden
-
-uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
-
+OSL_CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
+
+OSL_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+OSL_CFLAGS += -Wredundant-decls
+OSL_CFLAGS += -Os
+OSL_CFLAGS += -Wall
+OSL_CFLAGS += -Wuninitialized
+OSL_CFLAGS += -Wchar-subscripts
+OSL_CFLAGS += -Wformat-security
+OSL_CFLAGS += -Werror-implicit-function-declaration
+OSL_CFLAGS += -Wmissing-format-attribute
+OSL_CFLAGS += -Wunused-macros
+OSL_CFLAGS += -Wbad-function-cast
+OSL_CFLAGS += -fPIC
+OSL_CFLAGS += -fvisibility=hidden
+
+OSL_LDFLAGS += -Wl,-soname,$(soname)
+OSL_LDFLAGS += -Wl,-z,defs
+OSL_LDFLAGS += --shared
+
+# On ELf-based systems, the following conventions apply (see dhweeler's
+# Program Library HOWTO):
+#
+# The soname has the prefix ``lib'', the name of the library, the
+# phrase ``.so'', followed by a period and a version number that is
+# incremented whenever the interface changes.
 libname := osl
+soname := lib$(libname).so.$(x)
 
-ifeq ($(uname_s),Linux)
-	format := elf
-	LDFLAGS += -Wl,-soname,$(soname)
-	# disallow undefined symbols
-	LDFLAGS += -Wl,-z,defs
-endif
-ifeq ($(uname_s),Darwin)
-	# Darwin has its own idea on version numbers:
-	realname := lib$(libname).$(x).dylib
-	soname := $(realname)
-	linkername := lib$(libname).dylib
-	# The minor version number is an incremental number using the format
-	# X[.Y[.Z]]. To set the minor version number of a dynamic library, use
-	# the gcc -current_version option.
-	LDFLAGS += -current_version $(y).$(z)
-	#
-	# The compatibility version number of a library release specifies the
-	# earliest minor version of the clients linked against that release can
-	# use.
-	LDFLAGS += -compatibility_version $(y).0
-	LDFLAGS += -dynamiclib
-endif
-ifeq ($(uname_s),SunOS)
-	format := elf
-	# Solaris needs another set of flags
-	LDFLAGS += -z text
-	LDFLAGS += -z defs
-	CPPFLAGS += -I/opt/csw/include
-	LDFLAGS += -lc
-endif
-
-ifeq ($(uname_s),NetBSD)
-	format := elf
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
+# The real name adds to the soname a period, a minor number, another
+# period, and the release number.
+realname := $(soname).$(y).$(z)
 
-ifeq ($(uname_s),FreeBSD)
-	format := elf
-	LDFLAGS += -Wl,-soname,$(soname)
-endif
+# In addition, there's the name that the compiler uses when requesting
+# a library, (I'll call it the ``linker name''), which is simply the
+# soname without any version number.
+linkername := lib$(libname).so
 
-ifeq ($(format),elf)
-	# On ELf-based systems, the following conventions apply (see dhweeler's
-	# Program Library HOWTO):
-	#
-	# The soname has the prefix ``lib'', the name of the library, the
-	# phrase ``.so'', followed by a period and a version number that is
-	# incremented whenever the interface changes.
-	soname := lib$(libname).so.$(x)
-
-	# The real name adds to the soname a period, a minor number, another
-	# period, and the release number.
-	realname := $(soname).$(y).$(z)
-
-	# In addition, there's the name that the compiler uses when requesting
-	# a library, (I'll call it the ``linker name''), which is simply the
-	# soname without any version number.
-	linkername := lib$(libname).so
-	LDFLAGS += --shared
-endif
-
-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
-	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $(LIBCFLAGS) $<
+
+# 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) $<
 
 fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
-	$(CC) -o $@ $(fsck_objects) -llopsub
+	$(CC) -o $@ $(fsck_objects) $(LDFLAGS) -llopsub
 
+.PRECIOUS: %.lsg.h %.lsg.c
 %.lsg.c: %.suite
 	lopsubgen --gen-c < $<
 
@@ -136,34 +104,24 @@ oslfsck: $(fsck_objects)
 	lopsubgen --gen-man=$@ < $<
 
 $(realname): $(objects)
-	$(CC) $(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' $< >> $@
+	$(CC) $(OSL_LDFLAGS) $(LDFLAGS) -o $@ $(objects)
 
 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