VC++ warning fix

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

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

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

        $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
        $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 

-%.o : %.cpp
+.cpp.o:

        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 

-%.o : %.cxx
+.cxx.o:

        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf
        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf


@@ -57,14 +60,12 @@ 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@
 
 libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
 libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
 libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 
 libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 

-

 $(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
        $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
 $(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
        $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)


@@ -75,7 +76,8 @@ $(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
 
 $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib
 
 $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
        @$(INSTALL) -d $(top_builddir)/lib

-       ar $(AROPTIONS) $@ $(OBJECTS)
+       @$(RM) $@
+       $(AR) $(AROPTIONS) $@ $(OBJECTS)

        $(RANLIB) $@
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
        $(RANLIB) $@
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers