X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=0674495fe2ad81c70686682a69796aaf809e26c3;hp=b42b1a9413a7194582139307f57857de11871ab2;hb=aaedc06d0448b048c7d41074985f9ee81e93d077;hpb=c1a4bb030717f2d2d209ccd8ab898ab66fa16869

diff --git a/Makefile b/Makefile
index b42b1a9..0674495 100644
--- a/Makefile
+++ b/Makefile
@@ -41,32 +41,15 @@ uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 
 libname := osl
-ifeq ($(uname_s),Linux)
-	# On Linux, 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
+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).so
@@ -82,28 +65,59 @@ ifeq ($(uname_s),Darwin)
 	LDFLAGS += -dynamiclib
 endif
 ifeq ($(uname_s),SunOS)
+	format := elf
 	# Solaris needs another set of flags
-	LDFLAGS += --shared
 	LDFLAGS += -z text
 	LDFLAGS += -z defs
-	realname := lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
 	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
+
+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) oslfsck
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
-osl.c fsck.c: errtab.h
+osl.c fsck.c:
 
 -include Makefile.deps
 
 fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $<
 
-%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h
+%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h errtab.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-%.o: %.c Makefile
+%.o: %.c Makefile errtab.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 
 fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
@@ -131,12 +145,16 @@ osl_errors.h: errlist
 		-e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
-	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@
+	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
 osl.h: osl.h.in osl_errors.h Makefile
-	cat osl.h.in osl_errors.h > $@
+	echo '#ifndef _OSL_H' > $@
+	echo '#define _OSL_H' >> $@
+	cat osl.h.in osl_errors.h >> $@
+	echo '#endif /* _OSL_H */' >> $@
 clean:
-	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h fsck.cmdline.c
+	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+		fsck.cmdline.c oslfsck
 
 install: all
 	$(MKDIR) $(libdir) $(includedir)