fixes to allow compilation with FreeBSD make

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 37fdd424ee216bbc815b851eb0ff95ea7415056d..f5654ed37ba0fbf21c4b0e8974a0c122499835fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,34 +1,38 @@
-#
+#####################################################################

 # File:     makefile.unx
 # File:     makefile.unx

+# Purpose:  Makefile for Unix wxWindows ports (both GUI and wxBase)

 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993

-# Updated:  2001
+# Version:  $Id$

 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee

-#
-# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
-
-###################################################################
+#####################################################################

 
 include ./src/make.env
 
 
 include ./src/make.env
 

-############## override make.env for PIC ##########################
+#################### the implicit rules #############################
+
+# NB: we use the old style suffix rules (.c.o) and not the GNU make
+#     implicit rules (%.o: %.c) because they are more portable, in
+#     particular the BSD make understands the former but not the
+#     latter
+.SUFFIXES: .o .c .cpp .cxx .rsrc .r

 
 

-%.o : %.c
+.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 $@ $<
 
        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 

-%.r : %.rsrc
+.rsrc.r:

        $(DEREZ) $^ Carbon.r -useDF > $@
 
        $(DEREZ) $^ Carbon.r -useDF > $@
 

-########################### Paths #################################
+############################# Paths #################################

 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

diff --git a/src/make.env.in b/src/make.env.in
index b71612367204067082bd194e7c196d822b83c6e3..c847908904bdfd29661f38860f4aa2bbec1fa1c8 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -47,6 +47,7 @@ AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@

+RM          = rm -f

 
 SHARED_LD   = @SHARED_LD@
 
 
 SHARED_LD   = @SHARED_LD@