Don't mention MacOS and Solaris in README and INSTALL.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index ba61ef7769a258d2f2453d52fa5b374f54711553..aa0e6f6d06c704008292e077bd21bf9e18a43180 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,39 +28,25 @@ 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
-
-libname := osl
-
-ifeq ($(uname_s),Linux)
-       LDFLAGS += -Wl,-soname,$(soname)
-       # disallow undefined symbols
-       LDFLAGS += -Wl,-z,defs
-endif
-ifeq ($(uname_s),NetBSD)
-       LDFLAGS += -Wl,-soname,$(soname)
-endif
-
-ifeq ($(uname_s),FreeBSD)
-       LDFLAGS += -Wl,-soname,$(soname)
-endif
+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):
@@ -68,6 +54,7 @@ endif
 # 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)
 
 # The real name adds to the soname a period, a minor number, another
@@ -78,20 +65,21 @@ realname := $(soname).$(y).$(z)
 # a library, (I'll call it the ``linker name''), which is simply the
 # soname without any version number.
 linkername := lib$(libname).so
-LDFLAGS += --shared
 
-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) $<
+       $(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
 
 %.lsg.c: %.suite
        lopsubgen --gen-c < $<
@@ -103,7 +91,7 @@ oslfsck: $(fsck_objects)
        lopsubgen --gen-man=$@ < $<
 
 $(realname): $(objects)
-       $(CC) $(LDFLAGS) -o $@ $(objects)
+       $(CC) $(OSL_LDFLAGS) $(LDFLAGS) -o $@ $(objects)
 
 $(libname).sym: osl.h.in
        sed -Ene '/^int|^const/{s/.*(osl_.*)\(.*/\1/; p;}' $< > $@