OS/2 updates and initial toolbar implementation

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ead7b628e61063b1b434f6a061134f32f8077bdc..7397c1d4df0cf2b4ed6bce3e1ba5b84d272e4ef3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -318,9 +318,11 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
        @$(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)
 $(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)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL) -d $(build_libdir)


@@ -556,6 +558,7 @@ ALL_DIST: distclean
        cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
        cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex

+       cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex

        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        cp $(REGEXDIR)/README $(DISTDIR)/src/regex
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        cp $(REGEXDIR)/README $(DISTDIR)/src/regex
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex


@@ -1238,8 +1241,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
        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
 
        mkdir $(DISTDIR)/samples/treelay
        cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay