1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/msw/Makefile.am b/src/msw/Makefile.am
index e8295c02f76bc6c179a3739b1406cf53c36d5b07..31294a69144624c1ff7e4bcbf8e2028976a19c0a 100644 (file)
--- a/src/msw/Makefile.am
+++ b/src/msw/Makefile.am
@@ -1,9 +1,12 @@
 ## Purpose: The automake makefile for wxWindows (src/msw subdirectory)
-## Author:  Phil Blecker, Vadim Zeitlin
+## 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)
@@ -16,6 +19,12 @@ EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
 lib_LTLIBRARIES = @WX_LIBRARY_NAME@
 EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la libwx_msw.la
 
+# empty Motif library
+libwx_motif_la_SOURCES =
+
+# empty GTK library
+libwx_gtk_la_SOURCES =
+
 # these are the common files which always make part of the library
 libwx_msw_la_SOURCES = \
 \
@@ -42,6 +51,7 @@ libwx_msw_la_SOURCES = \
  date.cpp \
  datstrm.cpp \
  dcbase.cpp \
+ dlgcmn.cpp \
  docmdi.cpp \
  docview.cpp \
  dynlib.cpp \
@@ -54,6 +64,7 @@ libwx_msw_la_SOURCES = \
  helpbase.cpp \
  http.cpp \
  image.cpp \
+ imagbmp.cpp \
  imaggif.cpp \
  imagjpeg.cpp \
  imagpng.cpp \
@@ -94,7 +105,6 @@ libwx_msw_la_SOURCES = \
  gridg.cpp \
  laywin.cpp \
  panelg.cpp \
- printps.cpp \
  progdlgg.cpp \
  prop.cpp \
  propform.cpp \
@@ -105,6 +115,7 @@ libwx_msw_la_SOURCES = \
  statusbr.cpp \
  tabg.cpp \
  textdlgg.cpp \
+ tipdlg.cpp \
 \
  accel.cpp \
  app.cpp \
@@ -116,6 +127,7 @@ libwx_msw_la_SOURCES = \
  checkbox.cpp \
  choice.cpp \
  clipbrd.cpp \
+ colordlg.cpp \
  colour.cpp \
  combobox.cpp \
  control.cpp \
@@ -127,9 +139,9 @@ libwx_msw_la_SOURCES = \
  dcscreen.cpp \
  dcprint.cpp \
  dialog.cpp \
- dirdlg \
  filedlg.cpp \
  font.cpp \
+ fontdlg.cpp \
  frame.cpp \
  gauge95.cpp \
  gdiobj.cpp \
@@ -145,6 +157,8 @@ libwx_msw_la_SOURCES = \
  notebook.cpp \
  ownerdrw.cpp \
  palette.cpp \
+ printdlg.cpp \
+ printwin.cpp \
  pen.cpp \
  radiobox.cpp \
  radiobut.cpp \
@@ -166,7 +180,8 @@ libwx_msw_la_SOURCES = \
  utils.cpp \
  utilsexc.cpp \
  wave.cpp \
- window.cpp
+ window.cpp \
+ nativdlg.cpp
 
 # these are the sources which we build by our own rules
 #
@@ -174,12 +189,14 @@ libwx_msw_la_SOURCES = \
 #       don't know where to put lexer.l - if I put it in the sources too,
 #       automake tries to build lexer.lo... and fails, of course. (VZ)
 BUILT_SOURCES = parser.c lexer.c
+
+# VZ: can anyone please explain me why are we doing these substitutions?
 parser.c: $(srcdir)/../common/parser.y lexer.c
        $(YACC) $(srcdir)/../common/parser.y
        @sed -e "s;$(srcdir)/../common/y.tab.c;parser.y;g" < y.tab.c | \
        sed -e "s/BUFSIZ/5000/g"            | \
        sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-       sed -e "s/yy/PROIO_yy/g"            | \
+       sed -e "s/yy\([^.]\)/PROIO_yy\1/g"  | \
        sed -e "s/input/PROIO_input/g"      | \
        sed -e "s/unput/PROIO_unput/g"      > parser.c
        @$(RM) y.tab.c
@@ -187,13 +204,13 @@ parser.c: $(srcdir)/../common/parser.y lexer.c
 lexer.c: $(srcdir)/../common/lexer.l
        $(LEX) $(srcdir)/../common/lexer.l
        @sed -e "s;$(srcdir)/../common/lex.yy.c;lexer.l;g" < lex.yy.c | \
-       sed -e "s/yy/PROIO_yy/g"            | \
+       sed -e "s/yy\([^.]\)/PROIO_yy\1/g"  | \
        sed -e "s/input/PROIO_input/g"      | \
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 
 libwx_msw_la_LDFLAGS = -rpath @libdir@ \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -release $(LT_RELEASE)
+       -release $(LT_RELEASE) -no-undefined
 libwx_msw_la_LIBADD = $(LTLIBOBJS)
 libwx_msw_la_DEPENDENCIES = $(libwx_msw_la_LIBADD) lexer.l parser.y