Add missing dependency.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index cc4447890f6ddbc5dcb65f23b4ed9109e81fc3c4..0aff6beb99b3f42e4028cad88582457929d346fc 100644 (file)
--- 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,31 +65,54 @@ 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
+       CPPFLAGS += -I/opt/csw/include
+       LDFLAGS += -lc
+endif
+
+ifeq ($(uname_s),NetBSD)
+       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
-       CPPFLAGS += -I/opt/csw/include
-       LDFLAGS += -lc
+       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
@@ -134,7 +140,7 @@ 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 > $@