0. wxExecute() with IO redirection now works again (but the real fix is

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

diff --git a/src/makelib.env.in b/src/makelib.env.in
index 24d821b09c6dfa72065d835b9eb27fa72e9ec03d..3da9676922579fec1341f56dae126ff7a6a05608 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -41,17 +41,17 @@ TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 

-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
+# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
+.SUFFIXES: .o .c .cpp .cxx

 
 

-.c.o :
-       $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
+.c.o:
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<

 
 

-.cpp.o :
-       $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<

 
 

-.cxx.o :
-       $(CC) -c $(CPPFLAGS) $(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
 
 # 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 +60,25 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
 
 include $(top_builddir)/src/make.env
 
 
 include $(top_builddir)/src/make.env
 

-

 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 

-libtype_so: CREATE_LINKS
-
-libtype_a: $(TARGETLIB_STATIC)
+libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)

 
 

+libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)

 
 

-$(TARGETLIB_SHARED): $(OBJECTS)
+$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)

        @$(INSTALL) -d $(top_builddir)/lib
        @$(INSTALL) -d $(top_builddir)/lib

-       $(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
-
-CREATE_LINKS: $(TARGETLIB_SHARED)
+       $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)

        cd $(top_builddir)/lib \
                && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
        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
        @$(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
 
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 


@@ -122,5 +119,5 @@ clean:
              $(top_builddir)/lib/$(TARGETLIB_LINK2) \
              $(top_builddir)/lib/$(TARGETLIB_STATIC) core
 
              $(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