X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=8e0f163b671aaba4554cfe76a00febaa99c24fa1;hp=7ce449390d1eb9ef7bac35857984c4d45722aaa8;hb=aad03a8d23774d258ab90dadde119db15f26ec38;hpb=9aadc0af8df91d309f9f701f07a6db0542341618

diff --git a/Makefile b/Makefile
index 7ce4493..8e0f163 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,14 @@ 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
+deps := $(sort $(objects:.o=.d) $(fsck_objects:.o=.d))
 headers := osl.h
 executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
 ifeq "$(origin CC)" "default"
-        CC := gcc
+        CC := cc
 endif
 MKDIR := mkdir -p
 RM := rm -f
@@ -22,7 +23,6 @@ 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
@@ -42,88 +42,41 @@ 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")
-
+CFLAGS += -fPIC
+CFLAGS += -fvisibility=hidden
+
+LDFLAGS += -Wl,-soname,$(soname)
+LDFLAGS += -Wl,-z,defs
+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
-
-ifeq ($(uname_s),FreeBSD)
-	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 ($(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
+# 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
 
 all: $(realname) $(executables) $(man_pages)
 shared: $(realname)
 
-Makefile.deps: $(wildcard *.c *.h)
-	$(CC) -MM -MG *.c > $@
-osl.c fsck.c:
-
--include Makefile.deps
-
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
+-include $(deps)
+endif
 %.o: %.c Makefile errtab.h
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
+	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $<
 
+fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
 	$(CC) -o $@ $(fsck_objects) -llopsub
 
@@ -164,7 +117,7 @@ osl.h: osl.h.in osl_errors.h Makefile
 	echo '#endif /* _OSL_H */' >> $@
 clean:
 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
-		oslfsck *.a *.ga *.sym *.lsg.*
+		oslfsck *.a *.ga *.sym *.lsg.* *.d
 
 distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png