[poppler] poppler/utils: Makefile.am,1.2,1.3

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/utils
In directory gabe:/tmp/cvs-serv26668/utils

Modified Files:
	Makefile.am 
Log Message:
2005-12-21  Kristian Høgsberg  <krh at redhat.com>

        * utils/Makefile.am: Add parseargs.h to sources and add
        -I$(top_srcdir)/poppler to INCLUDES.

        * poppler/CairoFontEngine.cc: Apply patch from Hiroyuki Ikezoe to
        man non-embedded CJK fonts work.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/utils/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	18 Dec 2005 21:08:48 -0000	1.2
+++ Makefile.am	21 Dec 2005 17:30:34 -0000	1.3
@@ -1,5 +1,6 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
+	-I$(top_srcdir)/utils			\
 	-I$(top_srcdir)/poppler			\
 	$(UTILS_CFLAGS)
 
@@ -10,10 +11,12 @@
 
 man1_MANS = pdffonts.1 pdfimages.1 pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1
 
-pdffonts_SOURCES	= pdffonts.cc parseargs.c
-pdfimages_SOURCES	= pdfimages.cc ImageOutputDev.cc parseargs.c
-pdfinfo_SOURCES		= pdfinfo.cc parseargs.c
-pdftops_SOURCES		= pdftops.cc parseargs.c
-pdftotext_SOURCES	= pdftotext.cc parseargs.c
-pdftohtml_SOURCES	= pdftohtml.cc parseargs.c	\
+common = parseargs.c parseargs.h
+
+pdffonts_SOURCES	= pdffonts.cc $(common)
+pdfimages_SOURCES	= pdfimages.cc ImageOutputDev.cc $(common)
+pdfinfo_SOURCES		= pdfinfo.cc $(common)
+pdftops_SOURCES		= pdftops.cc $(common)
+pdftotext_SOURCES	= pdftotext.cc $(common)
+pdftohtml_SOURCES	= pdftohtml.cc $(common)	\
 	HtmlFonts.cc HtmlLinks.cc HtmlOutputDev.cc