X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/613d09959e5540f72c9239276be331fa36167176..40f7145ca55ccf1b197e70acf79bbd4aa5d85145:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ec015b84f7..946687f0bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,34 +1,38 @@
-#
+#####################################################################
 # File:     makefile.unx
+# Purpose:  Makefile for Unix wxWindows ports (both GUI and wxBase)
 # 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
-#
-# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
-
-###################################################################
+#####################################################################
 
 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 $@ $<
 
-%.o : %.cpp
+.cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-%.o : %.cxx
+.cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-%.r : %.rsrc
+.rsrc.r:
 	$(DEREZ) $^ Carbon.r -useDF > $@
 
-########################### Paths #################################
+############################# Paths #################################
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -96,6 +100,8 @@ TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
+X11DIR   = $(WXDIR)/src/x11
+MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
@@ -139,8 +145,8 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
 # .d and .h/.inl files for the current toolkit
 include @PORT_FILES@
 
-SOURCES = $(ALL_SOURCES)
-HEADERS = $(ALL_HEADERS)
+SOURCES = @ALL_SOURCES@
+HEADERS = @ALL_HEADERS@
 
 # for the objects and depfiles, we might be bulding only part of them
 # depending on configure arguments, so select a subset of ALL
@@ -187,25 +193,6 @@ PNGOBJS = \
 		pngget.o \
 		pngset.o
 
-FREETYPEOBJS = \
-		ftsystem.o \
-		autohint.o \
-		ftbase.o \
-		ftdebug.o \
-		ftglyph.o \
-		ftinit.o \
-		ftmm.o \
-		cff.o \
-		type1cid.o \
-		psnames.o \
-		psmodule.o \
-		raster1.o \
-		sfnt.o \
-		smooth.o \
-		truetype.o \
-		type1z.o \
-		winfnt.o
-
 JPEGOBJS = \
 		jcomapi.o \
 		jutils.o \
@@ -423,6 +410,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 
 	$(INSTALL) -d $(libdir)/wx
 	$(INSTALL) -d $(libdir)/wx/include
+	$(INSTALL) -d $(libdir)/wx/include/univ
 	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
 	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
@@ -433,6 +421,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi
 	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
 
 	@# always install msw headers for wxBase, it's much simpler
@@ -496,11 +485,12 @@ uninstall:
 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config
 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
-	@$(RM) $(datadir)/wx/afm/*
-	@$(RM) $(datadir)/wx/gs_afm/*
+	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
+	@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
-	@-rmdir $(datadir)/wx/gs_afm
-	@-rmdir $(datadir)/wx/afm
+	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
+	@-rmdir $(datadir)/wx/$(VER_MAJMIN)
 	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -523,6 +513,7 @@ uninstall:
 	@if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
 	@if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
 	@if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
+	@if test -d $(includedir)/wx/univ; then rmdir $(includedir)/wx/univ; fi
 	@if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
 	@if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
 	@if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
@@ -591,14 +582,18 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
-	cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
+	mkdir $(DISTDIR)/art
+	mkdir $(DISTDIR)/art/gtk
+	mkdir $(DISTDIR)/art/motif
+	cp $(WXDIR)/art/*.xpm $(DISTDIR)/art
+	cp $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
+	cp $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
-	mkdir $(DISTDIR)/src/html/bitmaps
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
@@ -619,7 +614,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
@@ -656,7 +650,7 @@ BASE_DIST: ALL_DIST
 	cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
 	cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-	cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
@@ -683,7 +677,6 @@ BASE_DIST: ALL_DIST
 GTK_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
-	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
 	cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
@@ -1068,6 +1061,13 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
+	mkdir $(DISTDIR)/samples/mobile
+	cp $(SAMPDIR)/mobile/Makefile.in $(DISTDIR)/samples/mobile
+	mkdir $(DISTDIR)/samples/mobile/wxedit
+	cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
+	cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
+	cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
+    
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup