From 8bedcdce08e1575b74250d2ebac4355a687ccf8d Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 22 Jun 1999 10:45:56 +0000 Subject: [PATCH] Makefiles without dependencies Compile fixes... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.am | 3 ++- include/wx/cmndata.h | 1 + src/common/longlong.cpp | 3 ++- src/gtk/Makefile.am | 3 +++ src/gtk1/Makefile.am | 3 +++ src/motif/Makefile.am | 3 +++ src/motif/app.cpp | 2 ++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e7f60a86cf..6540a67638 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies +AUTOMAKE_OPTIONS = 1.3 +# no-dependencies SUBDIRS = include src samples misc # utils user docs diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 2b298bd016..51d9ca2555 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -18,6 +18,7 @@ #include "wx/font.h" #include "wx/colour.h" +#include "wx/gdicmn.h" #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT class WXDLLEXPORT wxPrintSetupData; diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp index 46e5bf98e4..704f95e7f6 100644 --- a/src/common/longlong.cpp +++ b/src/common/longlong.cpp @@ -465,5 +465,6 @@ ostream& operator<< (ostream& o, const wxLongLongWx& ll) return o << result; } -#endif wxUSE_LONGLONG_WX +#endif + // wxUSE_LONGLONG_NATIVE diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 85dc87380b..65cf3b27c2 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -4,6 +4,9 @@ ## ## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS = 1.3 +# no-dependencies + SUFFIXES = .cpp .c DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am index 85dc87380b..65cf3b27c2 100644 --- a/src/gtk1/Makefile.am +++ b/src/gtk1/Makefile.am @@ -4,6 +4,9 @@ ## ## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS = 1.3 +# no-dependencies + SUFFIXES = .cpp .c DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am index 080c7f678c..28ab4b97ab 100644 --- a/src/motif/Makefile.am +++ b/src/motif/Makefile.am @@ -4,6 +4,9 @@ ## ## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS = 1.3 +# no-dependencies + SUFFIXES = .cpp .c DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) diff --git a/src/motif/app.cpp b/src/motif/app.cpp index b70716f889..2ccea798a9 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -28,6 +28,8 @@ #include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" +#include "wx/log.h" +#include "wx/intl.h" #if wxUSE_THREADS #include "wx/thread.h" -- 2.45.2