help.de/compiler.htm help.de/dbbrowse.htm help.de/getcol.htm

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ceb5ea02ddf166f2f11c71bb12c7f0cb221c6cea..3049bb2aad7bfc3f4b85e8790049aedf191d0aae 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -266,7 +266,7 @@ TIFFOBJS    = \
                tif_write.o \
                tif_zip.o
 
-IODBC_OBJS = \
+IODBCOBJS = \
                catalog.o \
                connect.o \
                dlf.o \
@@ -282,6 +282,7 @@ IODBC_OBJS = \
                misc.o \
                prepare.o \
                result.o
+        
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -522,6 +523,7 @@ BASE_DIST: ALL_DIST
        cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
        cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
        cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
+       cp $(WXDIR)/wxBase.dsp $(DISTDIR)
        cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
@@ -568,9 +570,11 @@ MSW_DIST: ALL_GUI_DIST
 DEMOS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/demos
        cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
-       cp $(DEMODIR)/configure $(DISTDIR)/samples
-       cp $(DEMODIR)/configure.in $(DISTDIR)/samples
-
+       cp $(DEMODIR)/configure $(DISTDIR)/demos
+       cp $(DEMODIR)/configure.in $(DISTDIR)/demos
+       
+       cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+           
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -879,6 +883,12 @@ SAMPLES_DIST: ALL_GUI_DIST
        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
+       cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+    
        mkdir $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
@@ -887,6 +897,11 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
     
+       mkdir $(DISTDIR)/samples/plot
+       cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
+       cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
+       cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
+    
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
@@ -917,6 +932,11 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
     
+       mkdir $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar
+
        mkdir $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
@@ -966,8 +986,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 UTILS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
-       cp $(UTILSDIR)/configure $(DISTDIR)/samples
-       cp $(UTILSDIR)/configure.in $(DISTDIR)/samples
+       cp $(UTILSDIR)/configure $(DISTDIR)/utils
+       cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
        
        mkdir $(DISTDIR)/utils/wxMMedia2
        mkdir $(DISTDIR)/utils/wxMMedia2/lib
@@ -1002,6 +1022,25 @@ MISC_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
+MANUAL_DIST:
+       mkdir $(DISTDIR)/docs
+       mkdir $(DISTDIR)/docs/latex
+       mkdir $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
+
+       -mkdir $(DISTDIR)/utils
+       mkdir $(DISTDIR)/utils/tex2rtf
+       mkdir $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+       cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
+
 distclean:
        $(RM) -r _dist_dir
 
@@ -1018,6 +1057,15 @@ dist: @GUIDIST@
        mv wxDemos demos; \
        fi
 
+debian-dist: GTK_DIST DEMOS_DIST UTILS_DIST MISC_DIST MANUAL_DIST
+       mkdir $(DISTDIR)/debian
+       -cp $(WXDIR)/debian/* $(DISTDIR)/debian
+       cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+       rm -rf $(WXDIR)/../wxwindows-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+       mv $(DISTDIR) $(WXDIR)/../wxwindows-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+
 clean:
        $(RM) *.o
        $(RM) *.d