X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f5a7f7409c1ea2ea04dadfdfd881adc980d8543..739e366ac91d526da389d01bb230cb628b16450a:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ec3662e27d..203b0a2366 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Version:  $Id$
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee
@@ -18,7 +18,7 @@ include ./src/make.env
 #     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
+.SUFFIXES: .o .c .cpp .cxx .rsrc .r .mm
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
@@ -29,6 +29,10 @@ include ./src/make.env
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
+# Objective-C++, right now just use CXXFLAGS
+.mm.o:
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+
 .rsrc.r:
 	$(DEREZ) $^ Carbon.r -useDF > $@
 
@@ -102,11 +106,13 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
+X11INC   = $(WXDIR)/include/wx/x11
 MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MACDIR   = $(WXDIR)/src/mac
+COCOADIR = $(WXDIR)/src/cocoa
 ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
@@ -280,22 +286,22 @@ TIFFOBJS = \
 		tif_write.o \
 		tif_zip.o
 
-IODBCOBJS = \
-		catalog.o \
-		connect.o \
-		dlf.o \
-		dlproc.o \
-		execute.o \
-		fetch.o \
-		hdbc.o \
-		henv.o \
-		herr.o \
-		hstmt.o \
-		info.o \
-		itrace.o \
-		misc.o \
-		prepare.o \
-		result.o
+# IODBCOBJS = \
+#		catalog.o \
+#		connect.o \
+#		dlf.o \
+#		dlproc.o \
+#		execute.o \
+#		fetch.o \
+#		hdbc.o \
+#		henv.o \
+#		herr.o \
+#		hstmt.o \
+#		info.o \
+#		itrace.o \
+#		misc.o \
+#		prepare.o \
+#		result.o
 
 
 ############################## Rules ##################################
@@ -441,6 +447,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/generic; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/univ; fi
 	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL_DIR) $(includedir)/wx/msw/ole; fi
+	@if test "@TOOLKIT_DIR@" = "motif"; then $(INSTALL_DIR) $(includedir)/wx/x11; fi
 
 	@# always install msw headers for wxBase, it's much simpler
 	@if test "$(USE_GUI)" = 0; then $(INSTALL_DIR) $(includedir)/wx/msw; fi
@@ -624,7 +631,6 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
@@ -649,6 +655,7 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
+	mkdir $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
@@ -732,6 +739,11 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
+	mkdir $(DISTDIR)/src/x11
+	mkdir $(DISTDIR)/include/wx/x11
+	cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(DISTDIR)/src/x11
+	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
+		$(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/*.* $(DISTDIR)/include
@@ -747,6 +759,10 @@ MACX_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/mac/macsock
 	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 
+# TODO: Distribute some files
+COCOA_DIST: ALL_GUI_DIST
+	cp $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
+
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	mkdir $(DISTDIR)/include/wx/msw/ctl3d
@@ -773,6 +789,8 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -1004,7 +1022,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/grid
 	cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
 	cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
-	cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/*.cpp $(SAMPDIR)/grid/*.h $(DISTDIR)/samples/grid
 
 	mkdir $(DISTDIR)/samples/help
 	mkdir $(DISTDIR)/samples/help/doc
@@ -1069,18 +1087,20 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
+	mkdir $(DISTDIR)/samples/internat/ju
 	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja
 	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja
 	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
@@ -1169,12 +1189,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
 
-	mkdir $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
-	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
-
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
@@ -1217,12 +1231,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
-	mkdir $(DISTDIR)/samples/resource
-	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
-	cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
-	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
-	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
-	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+#	mkdir $(DISTDIR)/samples/resource
+#	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+#	cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
+#	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+#	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+#	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
 
 	mkdir $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
@@ -1239,11 +1253,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
 
-	mkdir $(DISTDIR)/samples/proplist
-	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
-	cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist
-	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
-	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+#	mkdir $(DISTDIR)/samples/proplist
+#	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
+#	cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist
+#	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
+#	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
 
 	mkdir $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
@@ -1310,11 +1324,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
 
-	mkdir $(DISTDIR)/samples/treelay
-	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
-	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
-	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
-	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
+#	mkdir $(DISTDIR)/samples/treelay
+#	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
+#	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
+#	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
+#	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
 
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest