Fix some amusing bugs.

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

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index e5311d5fe035cf27befcc3aa1b5c3d619aca2ada..29372f6504abefa7ad4cbef6ebfdd925c39049d0 100644 (file)
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -15,7 +15,7 @@ LTKSRCDIR = $(srcdir)/../ltk
 LTKLIBDIR = ../ltk
 
 #CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@
-CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ `gnome-config --cflags gnomeui` -I$(srcdir) @X_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,10 +68,10 @@ CXX_SRC = \
 
 #------------------------------------------------------------------------
 
-all: gpdf
+all: gpdf xpdf
 
-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
-       pdftopbm$(EXE) pdfimages$(EXE)
+#all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
+#      pdftopbm$(EXE) pdfimages$(EXE)
 
 #------------------------------------------------------------------------
 
@@ -83,11 +83,11 @@ XPDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.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 XOutputDev.o XRef.o gpdf.o
+       TextOutputDev.o XRef.o gpdf.o
 
 XPDF_LIBS = -L$(LTKLIBDIR) -lLTK -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm
 
-GPDF_LIBS = `gnome-config --libs gnomeui`
+GPDF_LIBS = -L$(GOOLIBDIR) $(OTHERLIBS) -lGoo `gnome-config --libs gnomeui` -lm
 
 gpdf: $(GPDF_OBJS)
        $(CXX) $(CXXFLAGS) -o gpdf $(GPDF_OBJS) $(GPDF_LIBS)