X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b61a784c21a15b75d5a571f47d12a1ef591080..1e3698e55d7ee45267b69fa8ed5f94886ad47be9:/src/gtk1/Makefile.am

diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am
index 98d9f3263b..85dc87380b 100644
--- a/src/gtk1/Makefile.am
+++ b/src/gtk1/Makefile.am
@@ -1,4 +1,4 @@
-## Purpose: The automake makefile for wxWindows.
+## Purpose: The automake makefile for wxWindows (src/gtk subdirectory)
 ## Author:  Phil Blecker, Vadim Zeitlin
 ## Version: $Id$
 ##
@@ -9,15 +9,15 @@ SUFFIXES = .cpp .c
 DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
 LIBS = $(GUILIBS)
 
-VPATH = .:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
+VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
 
 EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
 
 lib_LTLIBRARIES = @WX_LIBRARY_NAME@
-EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la
+EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la
 
 # these are the common files which always make part of the library
-libwx_gtk2_la_SOURCES = \
+libwx_gtk_la_SOURCES = \
 \
  win_gtk.c \
  extended.c \
@@ -57,6 +57,7 @@ libwx_gtk2_la_SOURCES = \
  helpbase.cpp \
  http.cpp \
  image.cpp \
+ imagbmp.cpp \
  imaggif.cpp \
  imagjpeg.cpp \
  imagpng.cpp \
@@ -206,6 +207,8 @@ lexer.c: $(srcdir)/../common/lexer.l
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
 	@$(RM) lex.yy.c
 
-libwx_gtk2_la_LDFLAGS = -rpath @libdir@ -release @WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
-libwx_gtk2_la_LIBADD = $(LTLIBOBJS)
-libwx_gtk2_la_DEPENDENCIES = $(libwx_gtk2_la_LIBADD) lexer.l parser.y
+libwx_gtk_la_LDFLAGS = -rpath @libdir@ \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+	-release $(LT_RELEASE)
+libwx_gtk_la_LIBADD = $(LTLIBOBJS)
+libwx_gtk_la_DEPENDENCIES = $(libwx_gtk_la_LIBADD) lexer.l parser.y