[poppler] poppler/qt4/tests: Makefile.am,1.15,1.16

[Brad Hards]

Update of /cvs/poppler/poppler/qt4/tests
In directory kemper:/tmp/cvs-serv19905a/qt4/tests

Modified Files:
	Makefile.am 
Log Message:
Switch to using pkg-config to find Qt4.


Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt4/tests/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	25 Sep 2006 20:43:18 -0000	1.15
+++ Makefile.am	4 Mar 2007 07:30:32 -0000	1.16
@@ -4,8 +4,7 @@
 	-I$(top_srcdir)/qt4/src			\
 	-I$(top_srcdir)/qt			\
 	$(FONTCONFIG_CFLAGS)			\
-	$(POPPLER_QT4_CXXFLAGS)			\
-	$(POPPLER_QTTEST_CXXFLAGS)
+	$(POPPLER_QT4_CFLAGS)
 
 LDADDS =					\
 	$(top_builddir)/poppler/libpoppler.la	\
@@ -13,8 +12,6 @@
 	$(FONTCONFIG_LIBS)				\
 	$(POPPLER_QT4_LIBS)
 
-UT_LDADDS = $(LDADDS) $(POPPLER_QTTEST_LIBS)
-
 SUFFIXES: .moc
 
 .cpp.moc:
@@ -52,7 +49,7 @@
 
 stress_poppler_qt4_LDADD = $(LDADDS)
 
-if BUILD_POPPLER_QT4TESTS
+if BUILD_POPPLER_QT4
 TESTS = \
 	check_attachments	\
 	check_dateConversion 	\
@@ -66,31 +63,31 @@
 
 check_attachments_SOURCES = check_attachments.cpp
 check_attachments.$(OBJEXT): check_attachments.moc
-check_attachments_LDADD = $(UT_LDADDS)
+check_attachments_LDADD = $(LDADDS)
 
 check_dateConversion_SOURCES = check_dateConversion.cpp
 check_dateConversion.$(OBJEXT): check_dateConversion.moc
-check_dateConversion_LDADD = $(UT_LDADDS)
+check_dateConversion_LDADD = $(LDADDS)
 
 check_fonts_SOURCES = check_fonts.cpp
 check_fonts.$(OBJEXT): check_fonts.moc
-check_fonts_LDADD = $(UT_LDADDS)
+check_fonts_LDADD = $(LDADDS)
 
 check_metadata_SOURCES = check_metadata.cpp
 check_metadata.$(OBJEXT): check_metadata.moc
-check_metadata_LDADD = $(UT_LDADDS)
+check_metadata_LDADD = $(LDADDS)
 
 check_pagemode_SOURCES = check_pagemode.cpp
 check_pagemode.$(OBJEXT): check_pagemode.moc
-check_pagemode_LDADD = $(UT_LDADDS)
+check_pagemode_LDADD = $(LDADDS)
 
 check_permissions_SOURCES = check_permissions.cpp
 check_permissions.$(OBJEXT): check_permissions.moc
-check_permissions_LDADD = $(UT_LDADDS)
+check_permissions_LDADD = $(LDADDS)
 
 check_pagelayout_SOURCES = check_pagelayout.cpp
 check_pagelayout.$(OBJEXT): check_pagelayout.moc
-check_pagelayout_LDADD = $(UT_LDADDS)
+check_pagelayout_LDADD = $(LDADDS)
 
 endif