Fixed wxFileDialog and VC++ DLL compilation

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index a9aa36a0e23fe9704d811f72ddb337fbbcecd6e9..4d34f7e9c2cfa9956ccc0aa8c4e72a96052a357a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -13,7 +13,7 @@ OS=@OS@
 # compile a library only
 RULE=gslib
 
-# define common stuff
+# define source file for odbc
 IODBC_C_SRC=\
   iodbc/catalog.c \
   iodbc/connect.c \
@@ -27,11 +27,45 @@ IODBC_C_SRC=\
   iodbc/hstmt.c \
   iodbc/info.c \
   iodbc/itrace.c \
-  iodbc/main.c \
   iodbc/misc.c \
   iodbc/prepare.c \
   iodbc/result.c
 
+# define source file for png
+PNG_C_SRC=\
+ png/png.c \
+ png/pngset.c \
+ png/pngget.c \
+ png/pngrutil.c \
+ png/pngtrans.c \
+ png/pngwutil.c \
+ png/pngread.c \
+ png/pngrio.c \
+ png/pngwio.c \
+ png/pngwrite.c \
+ png/pngrtran.c \
+ png/pngwtran.c \
+ png/pngmem.c \
+ png/pngerror.c \
+ png/pngpread.c
+ 
+# define source file for zlib
+Z_C_SRC=\
+ zlib/adler32.c \
+ zlib/compress.c \
+ zlib/crc32.c \
+ zlib/gzio.c \
+ zlib/uncompr.c \
+ zlib/deflate.c \
+ zlib/trees.c \
+ zlib/zutil.c \
+ zlib/inflate.c \
+ zlib/infblock.c \
+ zlib/inftrees.c \
+ zlib/infcodes.c \
+ zlib/infutil.c \
+ zlib/inffast.c
+ 
 # include gtk.inc, qt.inc or motif.inc here
 include @MAKEINCLUDE@
 
@@ -39,9 +73,10 @@ include @MAKEINCLUDE@
 STATIC_LIBRARY=lib$(LIB_TARGET).a
 SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
 
-LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
+LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
+# @GTK_JOYSTICK@
 
-LIB_C_ALL_SRC=$(LIB_C_SRC) @IOBC_C_SRC@ parser.c
+LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ @PNG_C_SRC@ @Z_C_SRC@ parser.c
 
 #define library objects
 LIB_OBJ=\
@@ -52,6 +87,7 @@ all::
        @if test ! -d gtk; then mkdir gtk; fi
        @if test ! -d qt; then mkdir qt; fi
        @if test ! -d motif; then mkdir motif; fi
+       @if test ! -d motif/xmcombo; then mkdir motif/xmcombo; fi
        @if test ! -d common; then mkdir common; fi
        @if test ! -d generic; then mkdir generic; fi
        @if test ! -d png; then mkdir png; fi
@@ -66,6 +102,7 @@ install::
        @$(WXBASEDIR)/mkinstalldirs \
           $(includedir)/wx \
           $(includedir)/wx/gtk \
+          $(includedir)/wx/motif \
           $(includedir)/wx/common \
           $(includedir)/wx/generic \
           $(includedir)/wx/protocol \
@@ -78,14 +115,29 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
+       done ; \
+       for f in *.cpp ; do \
+         rm -f $(includedir)/wx/$$f ; \
+         $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        done
-       @echo "  Copying headers from /include/wx/gtk"
-       @cd $(WXBASEDIR)/include/wx/gtk ; \
-       $(INSTALL) -d $(includedir)/wx/gtk ; \
-       for f in *.h ; do \
-         rm -f $(includedir)/wx/gtk/$$f ; \
-         $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
-       done ;
+       @if test "@TOOLKIT@" = "GTK" ; then \
+         echo "  Copying headers from /include/wx/gtk" ; \
+         cd $(WXBASEDIR)/include/wx/gtk ; \
+         $(INSTALL) -d $(includedir)/wx/gtk ; \
+         for f in *.h ; do \
+           rm -f $(includedir)/wx/gtk/$$f ; \
+           $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
+         done ; \
+       fi
+       @if test "@TOOLKIT@" = "MOTIF" ; then \
+         echo "  Copying headers from /include/wx/motif" ; \
+         cd $(WXBASEDIR)/include/wx/motif ; \
+         $(INSTALL) -d $(includedir)/wx/motif ; \
+         for f in *.h ; do \
+           rm -f $(includedir)/wx/motif/$$f ; \
+           $(INSTALL_DATA) $$f $(includedir)/wx/motif/$$f ; \
+         done ; \
+       fi
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \
@@ -100,22 +152,29 @@ install::
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
        @echo "  Moving setup.h to library path"
-       @$(INSTALL) -d $(libdir)/wx/include/wx/gtk ;\
-       mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ;
+       @if test "@TOOLKIT@" = "GTK" ; then \
+         cd $(WXBASEDIR)/src ; \
+         $(INSTALL) -d $(libdir)/wx/include/wx/gtk ; \
+         mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ; \
+       fi
+       @if test "@TOOLKIT@" = "MOTIF" ; then \
+         cd $(WXBASEDIR)/src ; \
+         $(INSTALL) -d $(libdir)/wx/include/wx/motif ; \
+         mv $(includedir)/wx/motif/setup.h $(libdir)/wx/include/wx/motif/setup.h ; \
+       fi
        @echo "  Copying wx-config"
-       @cd $(WXBASEDIR) ; \
-         $(INSTALL) -d $(bindir) ;\
+       @cd $(WXBASEDIR)/src ; \
+         $(INSTALL) -d $(bindir) ; \
          rm -f $(bindir)/wx-config ; \
-         $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
+         $(INSTALL_PROGRAM) $(WXBASEDIR)/wx-config $(bindir)/wx-config
        @echo "  Copying static library"
-       @cd $(WXBASEDIR)/lib/$(OS) ; \
+       @cd $(WXBASEDIR)/src ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
-         $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
+         $(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
        @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
          echo "  Copying shared library" ; \
-         cd $(WXBASEDIR)/lib/$(OS) ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
-           $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
+           $(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
            $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
            echo " " ; \