[kaffe] CVS kaffe (dalibor): more compilation fixes for QtAWT

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Tue Aug 26 07:17:02 2003


PatchSet 3981 
Date: 2003/08/26 14:14:44
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
more compilation fixes for QtAWT

Members: 
	ChangeLog:1.1578->1.1579 
	libraries/clib/awt/qt/Makefile.am:1.5->1.6 
	libraries/clib/awt/qt/Makefile.in:1.24->1.25 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1578 kaffe/ChangeLog:1.1579
--- kaffe/ChangeLog:1.1578	Tue Aug 26 05:38:49 2003
+++ kaffe/ChangeLog	Tue Aug 26 14:14:44 2003
@@ -1,3 +1,11 @@
+2003-08-26  Dalibor Topic <robilad@kaffe.org>
+
+	* libraries/clib/awt/qt/Makefile.am:
+	(AM_CPPFLAGS) new variable. Added generated include files.
+
+	* libraries/clib/awt/qt/Makefile.in:
+	Regenerated.
+	
 2003-08-26  Guilhem Lavaux <guilhem@kaffe.org>
 
 	* libraries/javalib/java/text/SimpleDateFormat.java:
Index: kaffe/libraries/clib/awt/qt/Makefile.am
diff -u kaffe/libraries/clib/awt/qt/Makefile.am:1.5 kaffe/libraries/clib/awt/qt/Makefile.am:1.6
--- kaffe/libraries/clib/awt/qt/Makefile.am:1.5	Mon Jun  2 04:34:04 2003
+++ kaffe/libraries/clib/awt/qt/Makefile.am	Tue Aug 26 14:14:45 2003
@@ -14,6 +14,7 @@
 native_LTLIBRARIES = libawt.la
 
 AM_CXXFLAGS := -fno-exceptions -fno-rtti $(CXXFLAGS) $(QT_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_builddir)/include
 
 AWT_LIBS = -L$(QTDIR)/lib
 
@@ -47,7 +48,5 @@
 	imggif.cc \
 	imgjpeg.cc \
 	imgpng.cc
-
-	
 
 
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.24 kaffe/libraries/clib/awt/qt/Makefile.in:1.25
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.24	Thu Jul 31 22:46:55 2003
+++ kaffe/libraries/clib/awt/qt/Makefile.in	Tue Aug 26 14:14:45 2003
@@ -246,6 +246,7 @@
 native_LTLIBRARIES = libawt.la
 
 AM_CXXFLAGS := -fno-exceptions -fno-rtti $(CXXFLAGS) $(QT_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_builddir)/include
 
 libawt_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|kaffe)_"
 libawt_la_LIBADD = $(AWT_LIBS) $(QT_LDADD)