[poppler] test: ChangeLog,1.11,1.12 Makefile,1.8,1.9

[Jeff Muizelaar]

Update of /cvs/poppler/test
In directory gabe:/tmp/cvs-serv6107

Modified Files:
	ChangeLog Makefile 
Log Message:
2005-12-27  Jeff Muizelaar  <jeff at infidigm.net>

	* Makefile: make building without libtool the default.
	To build with libtool, set the POPPLER_DIR environment variable
	to the build directory of poppler.


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/test/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	27 Dec 2005 19:17:06 -0000	1.11
+++ ChangeLog	27 Dec 2005 19:30:27 -0000	1.12
@@ -1,3 +1,9 @@
+2005-12-27  Jeff Muizelaar  <jeff at infidigm.net>
+
+	* Makefile: make building without libtool the default.
+	To build with libtool, set the POPPLER_DIR environment variable
+	to the build directory of poppler.
+
 2005-12-27  Jeff Muizelaar <jeff at infidigm.net>
 
 	* test-poppler.c: (main):

Index: Makefile
===================================================================
RCS file: /cvs/poppler/test/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	19 Dec 2005 00:49:40 -0000	1.8
+++ Makefile	27 Dec 2005 19:30:27 -0000	1.9
@@ -2,12 +2,18 @@
 LDLIBS = $(shell pkg-config --libs poppler-glib)
 
 PDFS = $(addprefix tests/, mask.pdf text.pdf image.pdf type3.pdf cropbox.pdf inline-image.pdf)
-POPPLER_DIR = ../poppler-build
+
+ifdef POPPLER_DIR
+	POPPLER_DEPS = $(POPPLER_DIR)/poppler/libpoppler.la
+endif
 
 all : test-poppler $(PDFS)
 
-test-poppler: buffer-diff.o  read-png.o  test-poppler.o  write-png.o  xmalloc.o $(POPPLER_DIR)/poppler/libpoppler.la
-	$(POPPLER_DIR)/libtool --mode=link gcc  -g -O2   -o $@  $^ $(POPPLER_DIR)/poppler/libpoppler.la $(POPPLER_DIR)/glib/libpoppler-glib.la 
+test-poppler: buffer-diff.o  read-png.o  test-poppler.o  write-png.o  xmalloc.o $(POPPLER_DEPS)
+ifdef POPPLER_DIR
+	$(POPPLER_DIR)/libtool --mode=link gcc  -g -O2  -lpng -o $@  $^ $(POPPLER_DIR)/poppler/libpoppler.la $(POPPLER_DIR)/glib/libpoppler-glib.la 
+endif
+
 clean :
 	rm test-poppler *.o tests/*out.png