1. fixed Maximise() mismatch between wxFrame and wxMDIFrame

[wxWidgets.git] / src / gtk1 / Makefile.am

diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am
index e9fc7542c5939dbb600b45e3e732ac20911435e6..edda346de00d9f54be242ae2c0ab1a580dfa5b70 100644 (file)
--- a/src/gtk1/Makefile.am
+++ b/src/gtk1/Makefile.am
@@ -1,79 +1,82 @@
-## Purpose: The automake makefile for wxWindows.
-## Author:  Phil Blecker, Vadim Zeitlin
+## Purpose: The automake makefile for wxWindows (src/gtk subdirectory)
+## Author:  Phil Blecker, Vadim Zeitlin, Robert Roebling
 ## Version: $Id$
 ##
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS = 1.3
+# no-dependencies
+
 SUFFIXES = .cpp .c
 
 DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
 LIBS = $(GUILIBS)
 
-VPATH = .:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
-
-EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
+VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH}
 
 lib_LTLIBRARIES = @WX_LIBRARY_NAME@
-EXTRA_LTLIBRARIES = libwx_gtk2.la libwx_motif2.la
+EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la
+
+# empty Motif library
+libwx_motif_la_SOURCES =
+
+# empty MSW/WINE library
+libwx_msw_la_SOURCES =
 
 # 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 \
- filefn.cpp \
- hash.cpp \
- list.cpp \
- matrix.cpp \
- memory.cpp \
- module.cpp \
- object.cpp \
- string.cpp \
- timercmn.cpp \
- utilscmn.cpp \
- tokenzr.cpp \
- variant.cpp \
- wxchar.cpp \
-\
  config.cpp \
  date.cpp \
  datstrm.cpp \
- db.cpp \
- dbtable.cpp \
  dcbase.cpp \
+ dlgcmn.cpp \
  docmdi.cpp \
  docview.cpp \
+ dynarray.cpp \
  dynlib.cpp \
  event.cpp \
+ ffile.cpp \
  file.cpp \
  fileconf.cpp \
+ filefn.cpp \
+ filesys.cpp \
  framecmn.cpp \
+ fs_inet.cpp \
+ fs_zip.cpp \
  ftp.cpp \
  gdicmn.cpp \
+ hash.cpp \
  helpbase.cpp \
  http.cpp \
  image.cpp \
+ imagbmp.cpp \
  imaggif.cpp \
  imagjpeg.cpp \
  imagpng.cpp \
  intl.cpp \
  ipcbase.cpp \
  layout.cpp \
+ list.cpp \
  log.cpp \
  longlong.cpp \
+ matrix.cpp \
+ memory.cpp \
  mimetype.cpp \
+ module.cpp \
  mstream.cpp \
+ object.cpp \
  objstrm.cpp \
  odbc.cpp \
  paper.cpp \
  prntbase.cpp \
  process.cpp \
  protocol.cpp \
- resourc2.cpp \
  resource.cpp \
  sckaddr.cpp \
  sckfile.cpp \
@@ -83,24 +86,38 @@ libwx_gtk2_la_SOURCES = \
  serbase.cpp \
  socket.cpp \
  stream.cpp \
+ string.cpp \
  tbarbase.cpp \
  tbarsmpl.cpp \
+ textcmn.cpp \
  textfile.cpp \
+ txtstrm.cpp \
  time.cpp \
+ timercmn.cpp \
+ tokenzr.cpp \
+ unzip.c \
  url.cpp \
+ utilscmn.cpp \
  valgen.cpp \
  validate.cpp \
  valtext.cpp \
+ variant.cpp \
  wfstream.cpp \
  wincmn.cpp \
+ wxchar.cpp \
  wxexpr.cpp \
  zstream.cpp \
+ zipstream.cpp \
+\
+ db.cpp \
+ dbtable.cpp \
 \
+ busyinfo.cpp \
  caret.cpp \
- choicdgg.cpp \
  colrdlgg.cpp \
  dcpsg.cpp \
  dirdlgg.cpp \
+ extdlgg.cpp \
  fontdlgg.cpp \
  gridg.cpp \
  helpext.cpp \
@@ -108,8 +125,6 @@ libwx_gtk2_la_SOURCES = \
  imaglist.cpp \
  laywin.cpp \
  listctrl.cpp \
- msgdlgg.cpp \
- notebook.cpp \
  panelg.cpp \
  printps.cpp \
  prntdlgg.cpp \
@@ -122,7 +137,7 @@ libwx_gtk2_la_SOURCES = \
  splitter.cpp \
  statusbr.cpp \
  tabg.cpp \
- textdlgg.cpp \
+ tipdlg.cpp \
  treectrl.cpp \
 \
  threadpsx.cpp \
@@ -137,6 +152,7 @@ libwx_gtk2_la_SOURCES = \
  checkbox.cpp \
  checklst.cpp \
  choice.cpp \
+ choicdlg.cpp \
  clipbrd.cpp \
  colour.cpp \
  combobox.cpp \
@@ -156,12 +172,12 @@ libwx_gtk2_la_SOURCES = \
  gauge.cpp \
  gdiobj.cpp \
  icon.cpp \
- joystick.cpp \
  listbox.cpp \
  main.cpp \
  mdi.cpp \
  menu.cpp \
  minifram.cpp \
+ msgdlg.cpp \
  notebook.cpp \
  palette.cpp \
  pen.cpp \
@@ -178,15 +194,32 @@ libwx_gtk2_la_SOURCES = \
  stattext.cpp \
  tbargtk.cpp \
  textctrl.cpp \
- threadno.cpp \
- threadsgi.cpp \
+ textdlg.cpp \
  timer.cpp \
  tooltip.cpp \
- treectrl.cpp \
  utilsgtk.cpp \
  utilsres.cpp \
  wave.cpp \
- window.cpp
+ window.cpp \
+\
+ htmlcell.cpp \
+ htmlfilter.cpp \
+ htmlhelp.cpp \
+ htmlhelp_io.cpp \
+ htmlparser.cpp \
+ htmltag.cpp \
+ htmlwin.cpp \
+ htmlwinparser.cpp \
+ mod_fonts.cpp \
+ mod_hline.cpp \
+ mod_image.cpp \
+ mod_layout.cpp \
+ mod_links.cpp \
+ mod_list.cpp \
+ mod_pre.cpp \
+ mod_tables.cpp \
+ search.cpp
+
 
 # these are the sources which we build by our own rules
 #
@@ -212,6 +245,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