1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am
index faa471ef06a3d9133aab785a6482f784a78b9ffa..9f05f9e07190e62e08fe1be1529f8641537be47c 100644 (file)
--- a/src/motif/Makefile.am
+++ b/src/motif/Makefile.am
@@ -4,23 +4,33 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
 ##
 ## 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)
 
 SUFFIXES = .cpp .c
 
 DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
 LIBS = $(GUILIBS)
 

-VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
+VPATH = .:${srcdir}:${srcdir}/xmcombo:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}

 
 EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
 
 lib_LTLIBRARIES = @WX_LIBRARY_NAME@
 
 EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
 
 lib_LTLIBRARIES = @WX_LIBRARY_NAME@

-EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la
+EXTRA_LTLIBRARIES = libwx_motif.la libwx_gtk.la libwx_msw.la
+
+# empty GTK library
+libwx_gtk_la_SOURCES =
+
+# empty MSW/WINE library
+libwx_msw_la_SOURCES =

 
 # these are the common files which always make part of the library
 libwx_motif_la_SOURCES = \
 \
  extended.c \
  parser.c \
 
 # these are the common files which always make part of the library
 libwx_motif_la_SOURCES = \
 \
  extended.c \
  parser.c \

+ xmcombo.c \

 \
  cmndata.cpp \
  dynarray.cpp \
 \
  cmndata.cpp \
  dynarray.cpp \


@@ -44,6 +54,7 @@ libwx_motif_la_SOURCES = \
  db.cpp \
  dbtable.cpp \
  dcbase.cpp \
  db.cpp \
  dbtable.cpp \
  dcbase.cpp \

+ dlgcmn.cpp \

  docmdi.cpp \
  docview.cpp \
  dynlib.cpp \
  docmdi.cpp \
  docview.cpp \
  dynlib.cpp \


@@ -107,20 +118,18 @@ libwx_motif_la_SOURCES = \
  imaglist.cpp \
  laywin.cpp \
  listctrl.cpp \
  imaglist.cpp \
  laywin.cpp \
  listctrl.cpp \

- msgdlgg.cpp \

  panelg.cpp \
  printps.cpp \
  prntdlgg.cpp \
  progdlgg.cpp \
  prop.cpp \
  panelg.cpp \
  printps.cpp \
  prntdlgg.cpp \
  progdlgg.cpp \
  prop.cpp \

- propform.cpp \
- proplist.cpp \

  sashwin.cpp \
  scrolwin.cpp \
  splitter.cpp \
  statusbr.cpp \
  tabg.cpp \
  textdlgg.cpp \
  sashwin.cpp \
  scrolwin.cpp \
  splitter.cpp \
  statusbr.cpp \
  tabg.cpp \
  textdlgg.cpp \

+ tipdlg.cpp \

  treectrl.cpp \
 \
  threadpsx.cpp \
  treectrl.cpp \
 \
  threadpsx.cpp \


@@ -158,7 +167,9 @@ libwx_motif_la_SOURCES = \
  main.cpp \
  mdi.cpp \
  menu.cpp \
  main.cpp \
  mdi.cpp \
  menu.cpp \

+ menuitem.cpp \

  minifram.cpp \
  minifram.cpp \

+ msgdlg.cpp \

  notebook.cpp \
  palette.cpp \
  pen.cpp \
  notebook.cpp \
  palette.cpp \
  pen.cpp \


@@ -171,15 +182,16 @@ libwx_motif_la_SOURCES = \
  spinbutt.cpp \
  statbmp.cpp \
  statbox.cpp \
  spinbutt.cpp \
  statbmp.cpp \
  statbox.cpp \

- statline.cpp \

  stattext.cpp \
  textctrl.cpp \
  timer.cpp \
  stattext.cpp \
  textctrl.cpp \
  timer.cpp \

- tooltip.cpp \
- utilsres.cpp \
- wave.cpp \
+ toolbar.cpp \
+ utils.cpp \

  window.cpp
 
  window.cpp
 

+# propform.cpp \
+# proplist.cpp \
+ 

 # these are the sources which we build by our own rules
 #
 # TODO: parser.y can be included into SOURCES, but for the sake of my life I
 # these are the sources which we build by our own rules
 #
 # TODO: parser.y can be included into SOURCES, but for the sake of my life I