fixes to wxGTK specfile

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index acf0b343911a6e984fbbbdf0e0954d66f752f86f..353b3a6faded6d1106e03005f6e7501a9468dc08 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,13 +17,13 @@ include ./src/make.env
 ############## override make.env for PIC ##########################
 
 %.o : %.c
-       $(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cpp
-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.o : %.cxx
-       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 %.r : %.rsrc
        $(DEREZ) $^ Carbon.r -useDF > $@
@@ -315,11 +315,13 @@ all: @WX_ALL@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
        $(AR) $(AROPTIONS) $@ $(OBJECTS)
        $(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
        @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
        $(AR) $(AROPTIONS) $@ glcanvas.o
        $(RANLIB) $@
 
@@ -411,11 +413,8 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
        $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
        cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
        $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-       @if test "@WX_LIBRARY_NAME_STATIC@" = "@WX_TARGET_LIBRARY@"; then $(RANLIB) $(libdir)/@WX_TARGET_LIBRARY@; fi
-       @# this installs the import library for a MSW DLL
-       @# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
-       @# import library name
-       @if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
+       @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
+               $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
@@ -525,6 +524,7 @@ uninstall:
 ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)
+       cp $(WXDIR)/aclocal.m4 $(DISTDIR)
        cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
@@ -539,10 +539,13 @@ ALL_DIST: distclean
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
        mkdir $(DISTDIR)/src
+       cp $(SRCDIR)/files.lst $(DISTDIR)/src/
        mkdir $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
@@ -564,9 +567,10 @@ ALL_DIST: distclean
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
        cp $(WXDIR)/wxBase.spec $(DISTDIR)
-       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt        
+       if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
+         cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
@@ -593,7 +597,6 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/unix
-       cp $(SRCDIR)/files.lst $(DISTDIR)/src/
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -636,11 +639,11 @@ BASE_DIST: ALL_DIST
        mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/unix
+       mkdir $(DISTDIR)/src/msw
        cp $(WXDIR)/wxBase.spec $(DISTDIR)
        cp @PORT_FILES@ $(DISTDIR)
-       cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
-       cp $(WXDIR)/wxBase*.dsp $(DISTDIR)
-       cp $(WXDIR)/wxBase*.dsw $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
        cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -678,10 +681,11 @@ GTK_DIST: ALL_GUI_DIST
        cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
-       cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
+       cp $(WXDIR)/wxMotif.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
+       cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
@@ -1296,6 +1300,7 @@ MANUAL_DIST:
        mkdir $(DISTDIR)/docs/latex
        mkdir $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.inc $(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
@@ -1311,6 +1316,7 @@ PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        mkdir $(DISTDIR)/wxPython/contrib/ogl
        mkdir $(DISTDIR)/wxPython/contrib/stc
+       mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
        mkdir $(DISTDIR)/wxPython/contrib/xrc
        mkdir $(DISTDIR)/wxPython/demo
        mkdir $(DISTDIR)/wxPython/demo/bitmaps
@@ -1330,6 +1336,7 @@ PYTHON_DIST:
        cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
        -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
        -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+       -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
        -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
        -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
        -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps