From 3a0a8b6c989904a4f3ac46738cc7a6d4c19f8a83 Mon Sep 17 00:00:00 2001 From: kramm Date: Sun, 13 Jan 2002 19:01:37 +0000 Subject: [PATCH] link against lib/librfxswf.a, not lib/rfxswf.o. --- pdf2swf/Makefile.in | 4 ++-- swfs/Makefile.in | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pdf2swf/Makefile.in b/pdf2swf/Makefile.in index 3040c4f..17c83b4 100644 --- a/pdf2swf/Makefile.in +++ b/pdf2swf/Makefile.in @@ -68,7 +68,7 @@ SUBDIRS = xpdf fonts ttf2pt1 bin_PROGRAMS = pdf2swf LDADD = pdf2swf_SOURCES = pdf2swf.cc pdfswf.cc pdfswf.h swfoutput.cc swfoutput.h spline.cc spline.h -pdf2swf_LDADD = ../lib/log.o ../lib/rfxswf.o xpdf/libpdf.a ttf2pt1/ttf2pt1.a +pdf2swf_LDADD = ../lib/librfxswf.a xpdf/libpdf.a ttf2pt1/ttf2pt1.a INCLUDES = -I../lib -I./xpdf -I./ttf2pt1 man_MANS = pdf2swf.1 CXXCOMPILE = $(CXX) -DDATADIR=\"$(pkgdatadir)\" $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -84,7 +84,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ pdf2swf_OBJECTS = pdf2swf.o pdfswf.o swfoutput.o spline.o -pdf2swf_DEPENDENCIES = ../lib/log.o ../lib/rfxswf.o xpdf/libpdf.a ttf2pt1/ttf2pt1.a +pdf2swf_DEPENDENCIES = ../lib/librfxswf.a xpdf/libpdf.a ttf2pt1/ttf2pt1.a pdf2swf_LDFLAGS = CXXFLAGS = @CXXFLAGS@ CXXLD = $(CXX) diff --git a/swfs/Makefile.in b/swfs/Makefile.in index 629e93b..1f614f7 100644 --- a/swfs/Makefile.in +++ b/swfs/Makefile.in @@ -74,9 +74,9 @@ WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ bin_PROGRAMS = simple_viewer PreLoaderTemplate LDADD = simple_viewer_SOURCES = simple_viewer.c -simple_viewer_LDADD = ../lib/rfxswf.o +simple_viewer_LDADD = ../lib/librfxswf.a PreLoaderTemplate_SOURCES = PreLoaderTemplate.c -PreLoaderTemplate_LDADD = ../lib/rfxswf.o +PreLoaderTemplate_LDADD = ../lib/librfxswf.a INCLUDES = -I../lib pkgdata_DATA = simple_viewer.swf PreLoaderTemplate.swf swft_loader.swf tessel_loader.swf mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -91,10 +91,10 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ simple_viewer_OBJECTS = simple_viewer.o -simple_viewer_DEPENDENCIES = ../lib/rfxswf.o +simple_viewer_DEPENDENCIES = ../lib/librfxswf.a simple_viewer_LDFLAGS = PreLoaderTemplate_OBJECTS = PreLoaderTemplate.o -PreLoaderTemplate_DEPENDENCIES = ../lib/rfxswf.o +PreLoaderTemplate_DEPENDENCIES = ../lib/librfxswf.a PreLoaderTemplate_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- 1.7.10.4