[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 1b8055ebf3f12c2c8411badf252986e1cd807bf0

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit a7795785c6ed6b166cd71e233b06f94344aeb67f
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Fri Jul 11 15:47:22 2008 +0200

    remove all references about QtXml

diff --git a/gui/gui.rules b/gui/gui.rules
index e333f08..8d1b26d 100644
--- a/gui/gui.rules
+++ b/gui/gui.rules
@@ -47,7 +47,7 @@ nodist_libfonduegui_a_SOURCES =			\
 gui/instnames.tbl.cxx: data/instructions.xml
 gui/instnames.tbl.cxx: DATAFILE=$(srcdir)/data/instructions.xml
 
-libfonduegui_a_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtXml_CFLAGS) $(QtScript_CFLAGS)
+libfonduegui_a_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtScript_CFLAGS)
 
 noinst_HEADERS += 			\
 	gui/controlpoint.h		\
diff --git a/nongui/nongui.rules b/nongui/nongui.rules
index 6301605..8cfdc93 100644
--- a/nongui/nongui.rules
+++ b/nongui/nongui.rules
@@ -35,7 +35,7 @@ nongui/encodertable.tbl.cxx: DATAFILE=$(srcdir)/data/instructions.xml
 nongui/unicodenameslist.awked.cxx: /usr/share/unicode/NamesList.txt
 nongui/unicodenameslist.awked.cxx: DATAFILE=/usr/share/unicode/NamesList.txt
 
-libfonduenongui_a_CPPFLAGS = $(QtCore_CFLAGS) $(QtXml_CFLAGS)
+libfonduenongui_a_CPPFLAGS = $(QtCore_CFLAGS)
 
 CLEANFILES += nongui/*.tbl.cxx nongui/*.moc.cxx nongui/*.awked.cxx
 
diff --git a/qscript/qscript.rules b/qscript/qscript.rules
index 7233002..df1dbcf 100644
--- a/qscript/qscript.rules
+++ b/qscript/qscript.rules
@@ -8,7 +8,7 @@ libfondueqscript_a_SOURCES =		\
 nodist_libfondueqscript_a_SOURCES =	\
 	qscript/scriptconsole.moc.cxx
 
-libfondueqscript_a_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtXml_CFLAGS) $(QtScript_CFLAGS)
+libfondueqscript_a_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtScript_CFLAGS)
 
 CLEANFILES += qscript/*.moc.cxx
 
diff --git a/src/src.rules b/src/src.rules
index 93cae5e..4bb140e 100644
--- a/src/src.rules
+++ b/src/src.rules
@@ -1,7 +1,7 @@
 bin_PROGRAMS += src/fondue
 
 src_fondue_SOURCES = src/main.cxx
-src_fondue_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtXml_CFLAGS) $(QtScript_CFLAGS)
-src_fondue_LDADD = libfonduegui.a libfonduefilters.a libfonduenongui.a libfondueqscript.a $(QtCore_LIBS) $(QtGui_LIBS) $(QtXml_LIBS) $(QtScript_LIBS)
+src_fondue_CPPFLAGS = $(QtCore_CFLAGS) $(QtGui_CFLAGS) $(QtScript_CFLAGS)
+src_fondue_LDADD = libfonduegui.a libfonduefilters.a libfonduenongui.a libfondueqscript.a $(QtCore_LIBS) $(QtGui_LIBS) $(QtScript_LIBS)
 
 ## vim:ft=automake

-- 
Fondue Font Editor