don't give empty message box if Parse(FALSE) was called and there was --help on the...

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index acb1f207f7fff7c2b3910662252e94852030b3f2..235024f2e1ec5a64fea90166f42f8d1d91c7a2ef 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,20 +179,22 @@ ZLIBOBJS = \
 
 PNGOBJS = \
                png.o \
+               pngerror.o \
+               pnggccrd.o \
+               pngget.o \
+               pngmem.o \
+               pngpread.o \
                pngread.o \
+               pngrio.o \
                pngrtran.o \
                pngrutil.o \
-               pngpread.o \
+               pngset.o \
                pngtrans.o \
+               pngvcrd.o \
+               pngwio.o \
                pngwrite.o \
                pngwtran.o \
-               pngwutil.o \
-               pngerror.o \
-               pngmem.o \
-               pngwio.o \
-               pngrio.o \
-               pngget.o \
-               pngset.o
+               pngwutil.o
 
 JPEGOBJS = \
                jcomapi.o \
@@ -318,9 +320,11 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
+# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
+#     but this seems to result in problems with libwx_gtk being linked in twice
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d $(build_libdir)
-       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
+       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL) -d $(build_libdir)
@@ -539,7 +543,6 @@ ALL_DIST: distclean
        cp $(WXDIR)/wxBase.spec $(DISTDIR)
        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
        mkdir $(DISTDIR)/lib
        cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
@@ -758,7 +761,8 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
        cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-       cp $(SRCDIR)/*.* $(DISTDIR)/src
+       cp $(SRCDIR)/*.??? $(DISTDIR)/src
+       cp $(SRCDIR)/*.?? $(DISTDIR)/src
        cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw
 
 UNIV_DIST: ALL_GUI_DIST
@@ -1239,8 +1243,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
-       mkdir $(DISTDIR)/samples/treectrl/bitmaps
-       cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
 
        mkdir $(DISTDIR)/samples/treelay
        cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
@@ -1351,11 +1353,14 @@ PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython/demo/dllwidget
        mkdir $(DISTDIR)/wxPython/src
        mkdir $(DISTDIR)/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython/scripts
        mkdir $(DISTDIR)/wxPython/wxPython
        mkdir $(DISTDIR)/wxPython/wxPython/lib
        mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
        mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
        mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+       mkdir $(DISTDIR)/wxPython/wxPython/tools
+       mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
        cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
        cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
@@ -1375,6 +1380,7 @@ PYTHON_DIST:
        -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
        -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
        -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+       -cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
        -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
        cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
        cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
@@ -1382,6 +1388,8 @@ PYTHON_DIST:
        cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
        cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
        cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+       cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+       cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distclean:
        $(RM) -r _dist_dir