From: kramm Date: Tue, 7 Jan 2003 08:40:56 +0000 (+0000) Subject: FreeBSD fixes. X-Git-Tag: release-0-4-4~165 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=bdb7953c6af7f79f77c6e1eef570dc9186a7b9f1;hp=98224e6d436b226dc8445db494efa7e8c3635c34;p=swftools.git FreeBSD fixes. --- diff --git a/lib/Makefile.in b/lib/Makefile.in index 2b63027..0aa620b 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -8,10 +8,12 @@ all: librfxswf.a lame_objects = lame/psymodel.o lame/fft.o lame/newmdct.o lame/quantize.o lame/takehiro.o lame/reservoir.o lame/quantize_pvt.o lame/vbrquantize.o lame/encoder.o lame/id3tag.o lame/version.o lame/tables.o lame/util.o lame/bitstream.o lame/set_get.o lame/VbrTag.o lame/lame.o rfxswf_modules = modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c -%.o: %.c - $(C) $< -o $@ - +bitio.o: bitio.c bitio.h + $(C) bitio.c -o $@ +log.o: log.c log.h + $(C) log.c -o $@ rfxswf.o: rfxswf.c rfxswf.h bitio.h log.h $(rfxswf_modules) + $(C) rfxswf.c -o $@ $(lame_objects): cd lame;make all;cd .. diff --git a/lib/lame/Makefile.in b/lib/lame/Makefile.in index cb21975..e4ddf3f 100644 --- a/lib/lame/Makefile.in +++ b/lib/lame/Makefile.in @@ -7,8 +7,40 @@ lame_objects = psymodel.o fft.o newmdct.o quantize.o takehiro.o reservoir.o qua all: $(lame_objects) -%.o: %.c - $(C) $< -o $@ +psymodel.o: psymodel.c + $(C) psymodel.c -o $@ +fft.o: fft.c + $(C) fft.c -o $@ +newmdct.o: newmdct.c + $(C) newmdct.c -o $@ +quantize.o: quantize.c + $(C) quantize.c -o $@ +takehiro.o: takehiro.c + $(C) takehiro.c -o $@ +reservoir.o: reservoir.c + $(C) reservoir.c -o $@ +quantize_pvt.o: quantize_pvt.c + $(C) quantize_pvt.c -o $@ +vbrquantize.o: vbrquantize.c + $(C) vbrquantize.c -o $@ +encoder.o: encoder.c + $(C) encoder.c -o $@ +id3tag.o: id3tag.c + $(C) id3tag.c -o $@ +version.o: version.c + $(C) version.c -o $@ +tables.o: tables.c + $(C) tables.c -o $@ +util.o: util.c + $(C) util.c -o $@ +bitstream.o: bitstream.c + $(C) bitstream.c -o $@ +set_get.o: set_get.c + $(C) set_get.c -o $@ +VbrTag.o: VbrTag.c + $(C) VbrTag.c -o $@ +lame.o: lame.c + $(C) lame.c -o $@ install: uninstall: diff --git a/pdf2swf/Makefile.in b/pdf2swf/Makefile.in index b762eb4..ef4f137 100644 --- a/pdf2swf/Makefile.in +++ b/pdf2swf/Makefile.in @@ -7,13 +7,16 @@ all: pdf2swf fonts = n021003l.pfb n021023l.pfb n021004l.pfb n021024l.pfb n019003l.pfb n019023l.pfb n019004l.pfb n019024l.pfb n022003l.pfb n022023l.pfb n022004l.pfb n022024l.pfb s050000l.pfb d050000l.pfb n021003l.afm n021023l.afm n021004l.afm n021024l.afm n019003l.afm n019023l.afm n019004l.afm n019024l.afm n022003l.afm n022023l.afm n022004l.afm n022024l.afm s050000l.afm d050000l.afm -%.o: %.cc - $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf $< -o $@ - pdf2swf.o: pdf2swf.cc SWFOutputDev.h + $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf pdf2swf.cc -o $@ SWFOutputDev.o: swfoutput.h SWFOutputDev.cc + $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf SWFOutputDev.cc -o $@ spline.o: spline.cc spline.h + $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf spline.cc -o $@ +encodings.o: encodings.cc + $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf encodings.cc -o $@ swfoutput.o: swfoutput.cc swfoutput.h spline.h + $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf swfoutput.cc -o $@ pdf2swf: pdf2swf.o SWFOutputDev.o swfoutput.o encodings.o spline.o xpdf/pdflib.a ttf2pt1/ttf2pt1.a $(LL) pdf2swf.o SWFOutputDev.o swfoutput.o encodings.o spline.o -o pdf2swf ../lib/librfxswf.a ttf2pt1/ttf2pt1.a xpdf/libpdf.a $(LIBS) diff --git a/pdf2swf/ttf2pt1/Makefile.in b/pdf2swf/ttf2pt1/Makefile.in index 9e2d2af..3e1b76a 100644 --- a/pdf2swf/ttf2pt1/Makefile.in +++ b/pdf2swf/ttf2pt1/Makefile.in @@ -5,11 +5,19 @@ include ../../Makefile.common all: libpdf.a -%.o: %.c - $(C) -I./ -Wno-parentheses $< -o $@ - ttf2pt1_objects = ft.o ttf.o pt1.o ttf2pt1.o t1asm.o +ft.o: ft.c + $(C) -I./ -Wno-parentheses ft.c -o $@ +ttf.o: ttf.c + $(C) -I./ -Wno-parentheses ttf.c -o $@ +pt1.o: pt1.c + $(C) -I./ -Wno-parentheses pt1.c -o $@ +ttf2pt1.o: ttf2pt1.c + $(C) -I./ -Wno-parentheses ttf2pt1.c -o $@ +t1asm.o: t1asm.c + $(C) -I./ -Wno-parentheses t1asm.c -o $@ + libpdf.a: $(ttf2pt1_objects) $(AR) r ttf2pt1.a $(ttf2pt1_objects) $(RANLIB) ttf2pt1.a diff --git a/pdf2swf/xpdf/Makefile.in b/pdf2swf/xpdf/Makefile.in index d8f04e7..e999b43 100644 --- a/pdf2swf/xpdf/Makefile.in +++ b/pdf2swf/xpdf/Makefile.in @@ -5,11 +5,10 @@ include ../../Makefile.common all: libpdf.a -%.o: %.cc - $(CC) -I./ $< -o $@ - -%.o: %.c - $(C) -I./ $< -o $@ +#%.o: %.cc +# $(CC) -I./ $< -o $@ +#%.o: %.c +# $(C) -I./ $< -o $@ libpdf_objects = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ CMap.o Catalog.o CharCodeToUnicode.o Decrypt.o Dict.o Error.o \ @@ -18,6 +17,76 @@ Gfx.o GfxFont.o GfxState.o GlobalParams.o Lexer.o Link.o \ NameToCharCode.o Object.o OutputDev.o PDFDoc.o PSTokenizer.o Page.o \ Parser.o Stream.o UnicodeMap.o XRef.o gfile.o gmem.o +Annot.o: Annot.cc + $(CC) -I./ Annot.cc -o $@ +Array.o: Array.cc + $(CC) -I./ Array.cc -o $@ +BuiltinFont.o: BuiltinFont.cc + $(CC) -I./ BuiltinFont.cc -o $@ +BuiltinFontTables.o: BuiltinFontTables.cc + $(CC) -I./ BuiltinFontTables.cc -o $@ +CMap.o: CMap.cc + $(CC) -I./ CMap.cc -o $@ +Catalog.o: Catalog.cc + $(CC) -I./ Catalog.cc -o $@ +CharCodeToUnicode.o: CharCodeToUnicode.cc + $(CC) -I./ CharCodeToUnicode.cc -o $@ +Decrypt.o: Decrypt.cc + $(CC) -I./ Decrypt.cc -o $@ +Dict.o: Dict.cc + $(CC) -I./ Dict.cc -o $@ +Error.o: Error.cc + $(CC) -I./ Error.cc -o $@ +FontEncodingTables.o: FontEncodingTables.cc + $(CC) -I./ FontEncodingTables.cc -o $@ +FontFile.o: FontFile.cc + $(CC) -I./ FontFile.cc -o $@ +Function.o: Function.cc + $(CC) -I./ Function.cc -o $@ +GHash.o: GHash.cc + $(CC) -I./ GHash.cc -o $@ +GList.o: GList.cc + $(CC) -I./ GList.cc -o $@ +GString.o: GString.cc + $(CC) -I./ GString.cc -o $@ +Gfx.o: Gfx.cc + $(CC) -I./ Gfx.cc -o $@ +GfxFont.o: GfxFont.cc + $(CC) -I./ GfxFont.cc -o $@ +GfxState.o: GfxState.cc + $(CC) -I./ GfxState.cc -o $@ +GlobalParams.o: GlobalParams.cc + $(CC) -I./ GlobalParams.cc -o $@ +Lexer.o: Lexer.cc + $(CC) -I./ Lexer.cc -o $@ +Link.o: Link.cc + $(CC) -I./ Link.cc -o $@ +NameToCharCode.o: NameToCharCode.cc + $(CC) -I./ NameToCharCode.cc -o $@ +Object.o: Object.cc + $(CC) -I./ Object.cc -o $@ +OutputDev.o: OutputDev.cc + $(CC) -I./ OutputDev.cc -o $@ +PDFDoc.o: PDFDoc.cc + $(CC) -I./ PDFDoc.cc -o $@ +PSTokenizer.o: PSTokenizer.cc + $(CC) -I./ PSTokenizer.cc -o $@ +Page.o: Page.cc + $(CC) -I./ Page.cc -o $@ +Parser.o: Parser.cc + $(CC) -I./ Parser.cc -o $@ +Stream.o: Stream.cc + $(CC) -I./ Stream.cc -o $@ +UnicodeMap.o: UnicodeMap.cc + $(CC) -I./ UnicodeMap.cc -o $@ +XRef.o: XRef.cc + $(CC) -I./ XRef.cc -o $@ +gfile.o: gfile.cc + $(CC) -I./ gfile.cc -o $@ + +gmem.o: gmem.c + $(C) -I./ gmem.c -o $@ + libpdf.a: $(libpdf_objects) $(AR) r libpdf.a $(libpdf_objects) $(RANLIB) libpdf.a diff --git a/src/Makefile.in b/src/Makefile.in index 437b709..c63d305 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -7,28 +7,37 @@ programs = wav2swf png2swf swfcombine swfstrings swfextract swfdump @JPEG2SWF@ all: $(programs) -%.o: %.c - $(C) $< -o $@ - wav2swf.o: wav2swf.c wav.h + $(C) wav2swf.c -o $@ +wav.o: wav.c wav.h + $(C) wav.c -o $@ +png2swf.o: png2swf.c + $(C) png2swf.c -o $@ +swfcombine.o: swfcombine.c + $(C) swfcombine.c -o $@ +swfdump.o: swfdump.c + $(C) swfdump.c -o $@ +swfextract.o: swfextract.c + $(C) swfextract.c -o $@ +swfstrings.o: swfstrings.c + $(C) swfstrings.c -o $@ +jpeg2swf.o: jpeg2swf.c + $(C) jpeg2swf.c -o $@ wav2swf: wav2swf.o wav.o - $(L) wav2swf.o wav.o -o wav2swf ../lib/librfxswf.a $(LIBS) - + $(L) wav2swf.o wav.o -o $@ ../lib/librfxswf.a $(LIBS) png2swf: png2swf.o - $(L) png2swf.o -o png2swf ../lib/librfxswf.a $(LIBS) - + $(L) png2swf.o -o $@ ../lib/librfxswf.a $(LIBS) swfcombine: swfcombine.o - $(L) swfcombine.o -o swfcombine ../lib/librfxswf.a $(LIBS) - + $(L) swfcombine.o -o $@ ../lib/librfxswf.a $(LIBS) +swfdump: swfdump.o + $(L) swfdump.o -o $@ ../lib/librfxswf.a $(LIBS) swfextract: swfextract.o - $(L) swfextract.o -o swfextract ../lib/librfxswf.a $(LIBS) - + $(L) swfextract.o -o $@ ../lib/librfxswf.a $(LIBS) swfstrings: swfstrings.o - $(L) swfstrings.o -o swfstrings ../lib/librfxswf.a $(LIBS) - + $(L) swfstrings.o -o $@ ../lib/librfxswf.a $(LIBS) jpeg2swf: jpeg2swf.o - $(L) jpeg2swf.o -o jpeg2swf ../lib/librfxswf.a $(LIBS) + $(L) jpeg2swf.o -o $@ ../lib/librfxswf.a $(LIBS) install: $(mkinstalldirs) $(bindir) diff --git a/swfs/Makefile.in b/swfs/Makefile.in index b00f5c8..e3d08ef 100644 --- a/swfs/Makefile.in +++ b/swfs/Makefile.in @@ -7,11 +7,19 @@ all: simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf programs = simple_viewer keyboard_viewer PreLoaderTemplate -%.o: %.c - $(C) -I../lib $< -o $@ - -%: %.o - $(L) $< -o $@ ../lib/librfxswf.a $(LIBS) +simple_viewer.o: simple_viewer.c + $(C) -I../lib simple_viewer.c -o $@ +keyboard_viewer.o: keyboard_viewer.c + $(C) -I../lib keyboard_viewer.c -o $@ +PreLoaderTemplate.o: PreLoaderTemplate.c + $(C) -I../lib PreLoaderTemplate.c -o $@ + +simple_viewer: simple_viewer.o + $(L) simple_viewer.o -o $@ ../lib/librfxswf.a $(LIBS) +keyboard_viewer: keyboard_viewer.o + $(L) keyboard_viewer.o -o $@ ../lib/librfxswf.a $(LIBS) +PreLoaderTemplate: PreLoaderTemplate.o + $(L) PreLoaderTemplate.o -o $@ ../lib/librfxswf.a $(LIBS) simple_viewer.swf: $(programs) @echo Calling ./keybard_viewer to create keyboard_viewer.swf @@ -34,9 +42,9 @@ install: $(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf $(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf test -f $(pkgdatadir)/swfs/default_viewer.swf || \ - $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf; \ + $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf; test -f $(pkgdatadir)/swfs/default_loader.swf || \ - $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf; \ + $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf; uninstall: $(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf