X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39989a809365a18a4ed98828837f8d51fe38be4e..82ac3b0a423b755c6329c2ae2faaab9576a3f647:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e4e37c9151..049f206a8b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,6 +112,7 @@ 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
@@ -285,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 ##################################
@@ -630,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
@@ -655,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
@@ -758,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
@@ -1017,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
@@ -1184,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