git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bee56ee
)
link against lib/librfxswf.a, not lib/rfxswf.o.
author
kramm
<kramm>
Sun, 13 Jan 2002 19:01:37 +0000
(19:01 +0000)
committer
kramm
<kramm>
Sun, 13 Jan 2002 19:01:37 +0000
(19:01 +0000)
pdf2swf/Makefile.in
patch
|
blob
|
history
swfs/Makefile.in
patch
|
blob
|
history
diff --git
a/pdf2swf/Makefile.in
b/pdf2swf/Makefile.in
index
3040c4f
..
17c83b4
100644
(file)
--- 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
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)
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
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)
pdf2swf_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXLD = $(CXX)
diff --git
a/swfs/Makefile.in
b/swfs/Makefile.in
index
629e93b
..
1f614f7
100644
(file)
--- 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
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_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
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
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
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)
PreLoaderTemplate_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)