X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/239bca2e6d38f4566e7bc6f93b8119a671f4a7dc..6e5fefdf863aa639a1f763f88232e2ef3e598e15:/src/gtk1/Makefile.am?ds=inline

diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am
index 389a549fa0..4af3fb61fb 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,19 +9,19 @@ 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 \
- utilsgtk.cpp \
+ parser.c \
 \
  cmndata.cpp \
  dynarray.cpp \
@@ -73,7 +73,6 @@ libwx_gtk2_la_SOURCES = \
  prntbase.cpp \
  process.cpp \
  protocol.cpp \
- resourc2.cpp \
  resource.cpp \
  sckaddr.cpp \
  sckfile.cpp \
@@ -109,7 +108,6 @@ libwx_gtk2_la_SOURCES = \
  laywin.cpp \
  listctrl.cpp \
  msgdlgg.cpp \
- notebook.cpp \
  panelg.cpp \
  printps.cpp \
  prntdlgg.cpp \
@@ -179,7 +177,6 @@ libwx_gtk2_la_SOURCES = \
  textctrl.cpp \
  timer.cpp \
  tooltip.cpp \
- treectrl.cpp \
  utilsgtk.cpp \
  utilsres.cpp \
  wave.cpp \
@@ -209,6 +206,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