No real changes.

[wxWidgets.git] / src / makelib.env.in

diff --git a/src/makelib.env.in b/src/makelib.env.in
index ca760d7c5870bb8baed39f9815bac6dad2ee0c42..daf3f6b710345bd92733a4412121b641b9f680cb 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -41,17 +41,19 @@ TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
+LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING@
 
-.c.o :
-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
+.SUFFIXES: .o .c .cpp .cxx
 
-.cpp.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+.c.o:
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
-.cxx.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
@@ -60,28 +62,25 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
 
 include $(top_builddir)/src/make.env
 
-
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
-libtype_so: CREATE_LINKS
+libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
-libtype_a: $(TARGETLIB_STATIC)
+libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 
-
-$(TARGETLIB_SHARED): $(OBJECTS)
+$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
-       $(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
-
-CREATE_LINKS: $(TARGETLIB_SHARED)
+       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING)
        cd $(top_builddir)/lib \
                && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
-$(TARGETLIB_STATIC): $(OBJECTS)
+$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
-       ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
-       $(RANLIB) $(top_builddir)/lib/$@
+       @$(RM) $@
+       $(AR) $(AROPTIONS) $@ $(OBJECTS)
+       $(RANLIB) $@
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 
@@ -122,5 +121,5 @@ clean:
              $(top_builddir)/lib/$(TARGETLIB_LINK2) \
              $(top_builddir)/lib/$(TARGETLIB_STATIC) core
 
-.PHONY: all shared static clean install install_static install_shared uninstall
+.PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean