From 559f612b3997098648af09b1cfdc95c61e1e2877 Mon Sep 17 00:00:00 2001 From: kramm <kramm> Date: Thu, 25 Nov 2004 13:04:51 +0000 Subject: [PATCH] added $(A) for lib extension. --- avi2swf/Makefile.in | 4 ++-- lib/Makefile.in | 8 ++++---- lib/action/Makefile.in | 2 +- lib/example/Makefile | 2 +- lib/lame/Makefile.in | 2 +- lib/python/Makefile.in | 6 +++--- pdf2swf/Makefile.in | 16 ++++++++-------- pdf2swf/xpdf/Makefile.in | 10 +++++----- src/Makefile.in | 40 ++++++++++++++++++++-------------------- swfs/Makefile.in | 14 +++++++------- 10 files changed, 52 insertions(+), 52 deletions(-) diff --git a/avi2swf/Makefile.in b/avi2swf/Makefile.in index 594bd12..b948950 100644 --- a/avi2swf/Makefile.in +++ b/avi2swf/Makefile.in @@ -21,7 +21,7 @@ v2swf.$(O): v2swf.c ../lib/q.h $(C) $< -o $@ avi2swf$(E): avi2swf.$(O) v2swf.$(O) videoreader_avifile.$(O) videoreader_vfw.$(O) ../lib/q.$(O) - $(LL) avi2swf.$(O) v2swf.$(O) videoreader_avifile.$(O) videoreader_vfw.$(O) ../lib/q.$(O) -o avi2swf$(E) ../lib/librfxswf.a $(LIBS) $(VIDEO_LIBS) + $(LL) avi2swf.$(O) v2swf.$(O) videoreader_avifile.$(O) videoreader_vfw.$(O) ../lib/q.$(O) -o avi2swf$(E) ../lib/librfxswf$(A) $(LIBS) $(VIDEO_LIBS) $(STRIP) avi2swf$(E) install: @@ -33,7 +33,7 @@ uninstall: @file=avi2swf;$(UNINSTALL_BIN);$(UNINSTALL_MAN1) clean: - rm -f *.o *.obj *.lo *.a *.la avi2swf avi2swf.exe gmon.out + rm -f *.o *.obj *.lo *.a *.lib *.la avi2swf avi2swf.exe gmon.out doc: perl ../parsedoc.pl avi2swf.doc diff --git a/lib/Makefile.in b/lib/Makefile.in index b821a58..47136ca 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -3,7 +3,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ include ../Makefile.common -all: librfxswf.a q.$(O) +all: librfxswf$(A) q.$(O) lame_objects = @lame_objects@ @@ -36,9 +36,9 @@ h.263/h263tables.$(O): h.263/h263tables.c h.263/h263tables.h h.263/swfvideo.$(O): h.263/swfvideo.c h.263/h263tables.h h.263/dct.h $(C) h.263/swfvideo.c -o h.263/swfvideo.$(O) -librfxswf.a: Makefile rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) - $(AR) r librfxswf.a rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) - $(RANLIB) librfxswf.a +librfxswf$(A): Makefile rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) + $(AR) r librfxswf$(A) rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) + $(RANLIB) librfxswf$(A) install: uninstall: diff --git a/lib/action/Makefile.in b/lib/action/Makefile.in index 7babed4..9ff5c9b 100755 --- a/lib/action/Makefile.in +++ b/lib/action/Makefile.in @@ -82,7 +82,7 @@ main: main.$(O) $(OBJS) $(L) -o main main.$(O) $(OBJS) $(LIBS) test: test.$(O) $(OBJECTS) - $(L) -o test $(OBJECTS) test.$(O) ../librfxswf.a -lm -ljpeg -lz -lt1 -lfreetype + $(L) -o test $(OBJECTS) test.$(O) ../librfxswf$(A) -lm -ljpeg -lz -lt1 -lfreetype # === CLEANING === diff --git a/lib/example/Makefile b/lib/example/Makefile index 398066d..4f93804 100644 --- a/lib/example/Makefile +++ b/lib/example/Makefile @@ -1,6 +1,6 @@ # Makefile -RFXSWF = ../librfxswf.a +RFXSWF = ../librfxswf$(A) LDLIBS = -L/usr/X11R6/lib -ljpeg -lm -lz -lX11 -lfreetype -lt1 #CFLAGS = -funsigned-char CC = gcc diff --git a/lib/lame/Makefile.in b/lib/lame/Makefile.in index 845face..495e323 100644 --- a/lib/lame/Makefile.in +++ b/lib/lame/Makefile.in @@ -45,5 +45,5 @@ lame.$(O): lame.c install: uninstall: clean: - rm -f *.o *.obj *.lo *.a *.la gmon.out + rm -f *.o *.obj *.lo *.a *.lib *.la gmon.out diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in index 9f0baa9..faebdc2 100644 --- a/lib/python/Makefile.in +++ b/lib/python/Makefile.in @@ -26,8 +26,8 @@ pyutils.$(O): pyutils.c pyutils.h SWF.$(O): SWF.c pyutils.h primitives.h taglist.h $(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c SWF.c -o SWF.$(O) -SWF.$(SLEXT): SWF.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) tagmap.$(O) action.$(O) primitives.$(O) pyutils.$(O) ../librfxswf.a Makefile - $(L) -g $(SHARED) SWF.$(O) tagmap.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) action.$(O) primitives.$(O) pyutils.$(O) -o SWF.$(SLEXT) $(PYTHON_LIB) ../librfxswf.a $(LIBS) +SWF.$(SLEXT): SWF.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) tagmap.$(O) action.$(O) primitives.$(O) pyutils.$(O) ../librfxswf$(A) Makefile + $(L) -g $(SHARED) SWF.$(O) tagmap.$(O) taglist.$(O) tag.$(O) image.$(O) tags.$(O) action.$(O) primitives.$(O) pyutils.$(O) -o SWF.$(SLEXT) $(PYTHON_LIB) ../librfxswf$(A) $(LIBS) #TODO: install: @@ -36,7 +36,7 @@ install: mypython$(E): mypython.c Makefile $(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) mypython.c -o mypython$(E) $(PYTHON_LIB) swfpython$(E): swfpython.c Makefile primitives.$(O) tagmap.$(O) taglist.$(O) tag.$(O) tags.$(O) action.$(O) pyutils.$(O) SWF.$(O) - $(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) swfpython.c -o swfpython$(E) $(PYTHON_LIB) ../librfxswf.a $(LIBS) + $(L) -Wno-redundant-decls -g $(PYTHON_INCLUDES) swfpython.c -o swfpython$(E) $(PYTHON_LIB) ../librfxswf$(A) $(LIBS) testmem$(E): testmem.c Makefile $(L) $(PYTHON_INCLUDES) testmem.c -o testmem$(E) $(PYTHON_LIB) $(LIBS) diff --git a/pdf2swf/Makefile.in b/pdf2swf/Makefile.in index 7614156..fa0026c 100644 --- a/pdf2swf/Makefile.in +++ b/pdf2swf/Makefile.in @@ -18,18 +18,18 @@ swfoutput.$(O): swfoutput.cc swfoutput.h spline.h pdf2swf.$(O): pdf2swf.cc SWFOutputDev.h $(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib pdf2swf.cc -o $@ -pdf2swf.a: Makefile SWFOutputDev.$(O) swfoutput.$(O) encodings.$(O) spline.$(O) - $(AR) r pdf2swf.a SWFOutputDev.$(O) swfoutput.$(O) encodings.$(O) spline.$(O) - $(RANLIB) pdf2swf.a +pdf2swf$(A): Makefile SWFOutputDev.$(O) swfoutput.$(O) encodings.$(O) spline.$(O) + $(AR) r pdf2swf$(A) SWFOutputDev.$(O) swfoutput.$(O) encodings.$(O) spline.$(O) + $(RANLIB) pdf2swf$(A) -pdf2swf$(E): pdf2swf.$(O) pdf2swf.a xpdf/libpdf.a ../lib/librfxswf.a - $(LL) pdf2swf.$(O) pdf2swf.a ../lib/librfxswf.a xpdf/libpdf.a $(LIBS) -o pdf2swf$(E) +pdf2swf$(E): pdf2swf.$(O) pdf2swf$(A) xpdf/libpdf$(A) ../lib/librfxswf$(A) + $(LL) pdf2swf.$(O) pdf2swf$(A) ../lib/librfxswf$(A) xpdf/libpdf$(A) $(LIBS) -o pdf2swf$(E) $(STRIP) pdf2swf$(E) -xpdf/libpdf.a: Makefile xpdf/gfile.cc xpdf/GfxState.cc xpdf/GlobalParams.cc +xpdf/libpdf$(A): Makefile xpdf/gfile.cc xpdf/GfxState.cc xpdf/GlobalParams.cc cd xpdf;$(MAKE) -ttf2pt1/ttf2pt1.a: Makefile ttf2pt1/ttf2pt1.c ttf2pt1/t1asm.c +ttf2pt1/ttf2pt1$(A): Makefile ttf2pt1/ttf2pt1.c ttf2pt1/t1asm.c cd ttf2pt1;$(MAKE) install: @@ -44,7 +44,7 @@ uninstall: @for file in $(fonts);do $(UNINSTALL_DATA) $(pkgdatadir)/fonts/$$file;done clean: - rm -f *.o *.obj *.lo *.a *.la pdf2swf font2swf gmon.out + rm -f *.o *.obj *.lo *.a *.lib *.la pdf2swf font2swf gmon.out @rm -f pdf2swf.exe font2swf.exe @rm -f pdf2swf$(E) font2swf.exe$(E) cd xpdf && $(MAKE) clean && cd .. diff --git a/pdf2swf/xpdf/Makefile.in b/pdf2swf/xpdf/Makefile.in index 0b8055c..023aba3 100644 --- a/pdf2swf/xpdf/Makefile.in +++ b/pdf2swf/xpdf/Makefile.in @@ -3,7 +3,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ include ../../Makefile.common -all: libpdf.a +all: libpdf$(A) libpdf_objects = GHash.$(O) GList.$(O) GString.$(O) gmem.$(O) gfile.$(O) \ FoFiTrueType.$(O) FoFiType1.$(O) FoFiType1C.$(O) FoFiBase.$(O) FoFiEncodings.$(O) \ @@ -102,13 +102,13 @@ gfile.$(O): gfile.cc gmem.$(O): gmem.c $(C) -I./ gmem.c -o $@ -libpdf.a: $(libpdf_objects) - $(AR) r libpdf.a $(libpdf_objects) - $(RANLIB) libpdf.a +libpdf$(A): $(libpdf_objects) + $(AR) r libpdf$(A) $(libpdf_objects) + $(RANLIB) libpdf$(A) install: uninstall: clean: - rm -f *.o *.obj *.lo *.a *.la gmon.out + rm -f *.o *.obj *.lo *.a *.lib *.la gmon.out diff --git a/src/Makefile.in b/src/Makefile.in index a81bc73..1b95e6b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -36,35 +36,35 @@ parser.$(O): parser.yy.c parser.h ../lib/q.h parser.yy.c: parser.lex flex -Bs -oparser.yy.c parser.lex -wav2swf$(E): wav2swf.$(O) wav.$(O) ../lib/librfxswf.a - $(L) wav2swf.$(O) wav.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +wav2swf$(E): wav2swf.$(O) wav.$(O) ../lib/librfxswf$(A) + $(L) wav2swf.$(O) wav.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -png2swf$(E): png2swf.$(O) ../lib/librfxswf.a - $(L) png2swf.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +png2swf$(E): png2swf.$(O) ../lib/librfxswf$(A) + $(L) png2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfcombine$(E): swfcombine.$(O) ../lib/librfxswf.a - $(L) swfcombine.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfcombine$(E): swfcombine.$(O) ../lib/librfxswf$(A) + $(L) swfcombine.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfdump$(E): swfdump.$(O) ../lib/librfxswf.a - $(L) swfdump.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfdump$(E): swfdump.$(O) ../lib/librfxswf$(A) + $(L) swfdump.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfextract$(E): swfextract.$(O) ../lib/librfxswf.a - $(L) swfextract.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfextract$(E): swfextract.$(O) ../lib/librfxswf$(A) + $(L) swfextract.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfstrings$(E): swfstrings.$(O) ../lib/librfxswf.a - $(L) swfstrings.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfstrings$(E): swfstrings.$(O) ../lib/librfxswf$(A) + $(L) swfstrings.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfbbox$(E): swfbbox.$(O) ../lib/librfxswf.a - $(L) swfbbox.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfbbox$(E): swfbbox.$(O) ../lib/librfxswf$(A) + $(L) swfbbox.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -font2swf$(E): font2swf.$(O) ../lib/librfxswf.a - $(L) font2swf.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +font2swf$(E): font2swf.$(O) ../lib/librfxswf$(A) + $(L) font2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf.a - $(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf$(A) + $(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ -swfc$(E): parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) ../lib/librfxswf.a - $(L) parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +swfc$(E): parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) ../lib/librfxswf$(A) + $(L) parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) $(STRIP) $@ install: diff --git a/swfs/Makefile.in b/swfs/Makefile.in index b18cc3c..eac421c 100644 --- a/swfs/Makefile.in +++ b/swfs/Makefile.in @@ -14,12 +14,12 @@ keyboard_viewer.$(O): keyboard_viewer.c PreLoaderTemplate.$(O): PreLoaderTemplate.c $(C) -I../lib PreLoaderTemplate.c -o $@ -simple_viewer$(E): simple_viewer.$(O) ../lib/librfxswf.a - $(L) simple_viewer.$(O) -o $@ ../lib/librfxswf.a $(LIBS) -keyboard_viewer$(E): keyboard_viewer.$(O) ../lib/librfxswf.a - $(L) keyboard_viewer.$(O) -o $@ ../lib/librfxswf.a $(LIBS) -PreLoaderTemplate$(E): PreLoaderTemplate.$(O) ../lib/librfxswf.a - $(L) PreLoaderTemplate.$(O) -o $@ ../lib/librfxswf.a $(LIBS) +simple_viewer$(E): simple_viewer.$(O) ../lib/librfxswf$(A) + $(L) simple_viewer.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) +keyboard_viewer$(E): keyboard_viewer.$(O) ../lib/librfxswf$(A) + $(L) keyboard_viewer.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) +PreLoaderTemplate$(E): PreLoaderTemplate.$(O) ../lib/librfxswf$(A) + $(L) PreLoaderTemplate.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) simple_viewer.swf: $(programs) @echo Calling ./keybard_viewer to create keyboard_viewer.swf @@ -56,7 +56,7 @@ uninstall: $(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_loader.swf clean: - rm -f *.o *.obj *.lo *.a *.la gmon.out + rm -f *.o *.obj *.lo *.a *.lib *.la gmon.out rm -f simple_viewer keyboard_viewer PreLoaderTemplate rm -f simple_viewer$(E) keyboard_viewer$(E) PreLoaderTemplate$(E) rm -f simple_viewer.exe keyboard_viewer.exe PreLoaderTemplate.exe -- 1.7.10.4