1. compilation fix for wxHelpHtmlController (which shouldn't be compiled #if

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

diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am
index 1eb1cc0befb9cd1e72db14397228722cd8594263..582287818235374527bbf109d94a663ac7b4f08f 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
 
+AUTOMAKE_OPTIONS = 1.3
+# no-dependencies
+
 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_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 \
+ xmcombo.c \
 \
  cmndata.cpp \
  dynarray.cpp \
@@ -44,12 +54,16 @@ libwx_motif_la_SOURCES = \
  db.cpp \
  dbtable.cpp \
  dcbase.cpp \
+ dlgcmn.cpp \
  docmdi.cpp \
  docview.cpp \
  dynlib.cpp \
  event.cpp \
  file.cpp \
  fileconf.cpp \
+ filesys.cpp \
+ fs_inet.cpp \
+ fs_zip.cpp \
  framecmn.cpp \
  ftp.cpp \
  gdicmn.cpp \
@@ -85,6 +99,7 @@ libwx_motif_la_SOURCES = \
  tbarbase.cpp \
  tbarsmpl.cpp \
  textfile.cpp \
+ txtstrm.cpp \
  time.cpp \
  url.cpp \
  valgen.cpp \
@@ -93,8 +108,11 @@ libwx_motif_la_SOURCES = \
  wfstream.cpp \
  wincmn.cpp \
  wxexpr.cpp \
+ unzip.c \
+ zipstream.cpp \
  zstream.cpp \
 \
+ busyinfo.cpp \
  caret.cpp \
  choicdgg.cpp \
  colrdlgg.cpp \
@@ -107,20 +125,18 @@ libwx_motif_la_SOURCES = \
  imaglist.cpp \
  laywin.cpp \
  listctrl.cpp \
- msgdlgg.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 \
+ tipdlg.cpp \
  treectrl.cpp \
 \
  threadpsx.cpp \
@@ -158,7 +174,9 @@ libwx_motif_la_SOURCES = \
  main.cpp \
  mdi.cpp \
  menu.cpp \
+ menuitem.cpp \
  minifram.cpp \
+ msgdlg.cpp \
  notebook.cpp \
  palette.cpp \
  pen.cpp \
@@ -171,15 +189,34 @@ libwx_motif_la_SOURCES = \
  spinbutt.cpp \
  statbmp.cpp \
  statbox.cpp \
- statline.cpp \
  stattext.cpp \
  textctrl.cpp \
  timer.cpp \
- tooltip.cpp \
- utilsres.cpp \
- wave.cpp \
- window.cpp
+ toolbar.cpp \
+ utils.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
 
+# 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