updated i18n sample, french translations are now in the "fr" subdirectory.

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index a59f072d30794a28ff61f59addeb436570b5434e..8c6214edd45be6d70fc7da508f8595b41116ca34 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -13,7 +13,7 @@ OS=@OS@
 # compile a library only
 RULE=gslib
 
 # compile a library only
 RULE=gslib
 

-# define common stuff
+# define source file for odbc

 IODBC_C_SRC=\
   iodbc/catalog.c \
   iodbc/connect.c \
 IODBC_C_SRC=\
   iodbc/catalog.c \
   iodbc/connect.c \


@@ -32,6 +32,41 @@ IODBC_C_SRC=\
   iodbc/prepare.c \
   iodbc/result.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@
 
 # include gtk.inc, qt.inc or motif.inc here
 include @MAKEINCLUDE@
 


@@ -39,9 +74,10 @@ include @MAKEINCLUDE@
 STATIC_LIBRARY=lib$(LIB_TARGET).a
 SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
 
 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) @IODBC_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=\
 
 #define library objects
 LIB_OBJ=\


@@ -67,6 +103,7 @@ install::
        @$(WXBASEDIR)/mkinstalldirs \
           $(includedir)/wx \
           $(includedir)/wx/gtk \
        @$(WXBASEDIR)/mkinstalldirs \
           $(includedir)/wx \
           $(includedir)/wx/gtk \

+          $(includedir)/wx/motif \

           $(includedir)/wx/common \
           $(includedir)/wx/generic \
           $(includedir)/wx/protocol \
           $(includedir)/wx/common \
           $(includedir)/wx/generic \
           $(includedir)/wx/protocol \


@@ -79,14 +116,29 @@ install::
        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        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
        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 ; \
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \


@@ -101,9 +153,17 @@ install::
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
        @echo "  Moving setup.h to library path"
          $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
        done
        @echo "  Moving setup.h to library path"

-       @cd $(WXBASEDIR)/src ; \
-       $(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
+       @echo "  Moving setup.h to library path"
+       @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)/src ; \
          $(INSTALL) -d $(bindir) ; \
        @echo "  Copying wx-config"
        @cd $(WXBASEDIR)/src ; \
          $(INSTALL) -d $(bindir) ; \