Makefiles without dependencies

  Compile fixes...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.am b/Makefile.am
index e7f60a86cfa01d015d6595f7531eac738bfffc75..6540a67638f075daff830e2caae05f0ec114195d 100644 (file)
--- 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 2b298bd01623a93ea6a975d55f799cf538087e1a..51d9ca25557301bc37f64e91d84f6938bdae7512 100644 (file)
--- 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 46e5bf98e4cdb95cbfa3593d1573b6ef2fc2c6bc..704f95e7f6f8a5cd9708565596425936c82900db 100644 (file)
--- 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 85dc87380bf73212f8b5918cbaff5402f5900dd9..65cf3b27c299bd76779a32ae27518a24fb7c1104 100644 (file)
--- 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 85dc87380bf73212f8b5918cbaff5402f5900dd9..65cf3b27c299bd76779a32ae27518a24fb7c1104 100644 (file)
--- 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 080c7f678c90538c23f8eb1f040ed71b83d398e8..28ab4b97ab721109e25bcd3b0c3db2047e7690fe 100644 (file)
--- 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 b70716f889f56348a1437c90a52d2d0a3543f5c4..2ccea798a93a8e13c99fbe6775ffdd5e4c40ba85 100644 (file)
--- 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"