X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f060d19d4394705a89149ec80292a3e4d59ed2e..344d296530bf1305ffc20210034e29f652755fca:/Makefile.in?ds=sidebyside

diff --git a/Makefile.in b/Makefile.in
index acb1f207f7..1618f514f7 100644
--- 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)
@@ -758,7 +762,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 +1244,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