Fix some amusing bugs.

[evince.git] / pdf / xpdf / Makefile.in

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index 73934ed37c91222e0b00a20ef4c0ea655e0b821b..29372f6504abefa7ad4cbef6ebfdd925c39049d0 100644 (file)
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -14,8 +14,8 @@ GOOLIBDIR = ../goo
 LTKSRCDIR = $(srcdir)/../ltk
 LTKLIBDIR = ../ltk
 
-CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@
-
+#CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@
+CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) `gnome-config --cflags gnomeui` -I$(srcdir) @Xpm_CFLAGS@ @X_CFLAGS@
 XLIBS = @Xpm_LIBS@ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@
 
 OTHERLIBS = @LIBS@
@@ -68,8 +68,10 @@ CXX_SRC = \
 
 #------------------------------------------------------------------------
 
-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
-       pdftopbm$(EXE) pdfimages$(EXE)
+all: gpdf xpdf
+
+#all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
+#      pdftopbm$(EXE) pdfimages$(EXE)
 
 #------------------------------------------------------------------------
 
@@ -77,8 +79,19 @@ XPDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
        GfxState.o Lexer.o Link.o LTKOutputDev.o Object.o OutputDev.o \
        Page.o Params.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
        TextOutputDev.o XOutputDev.o XRef.o xpdf.o
+
+GPDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
+       GfxState.o Lexer.o Link.o GOutputDev.o Object.o OutputDev.o \
+       Page.o Params.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+       TextOutputDev.o XRef.o gpdf.o
+
 XPDF_LIBS = -L$(LTKLIBDIR) -lLTK -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm
 
+GPDF_LIBS = -L$(GOOLIBDIR) $(OTHERLIBS) -lGoo `gnome-config --libs gnomeui` -lm
+
+gpdf: $(GPDF_OBJS)
+       $(CXX) $(CXXFLAGS) -o gpdf $(GPDF_OBJS) $(GPDF_LIBS)
+
 xpdf$(EXE): $(XPDF_OBJS)
        $(CXX) $(CXXFLAGS) -o xpdf$(EXE) $(XPDF_OBJS) $(XPDF_LIBS)
        $(STRIP) xpdf$(EXE)