From: kramm <kramm>
Date: Mon, 22 Nov 2004 19:15:59 +0000 (+0000)
Subject: object extension is now determined by configure. ($(O))
X-Git-Tag: release-0-6-3~152
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=2828d9c7bdb68ced20dabb45ffb50ee178cd0015

object extension is now determined by configure. ($(O))
---

diff --git a/avi2swf/Makefile.in b/avi2swf/Makefile.in
index 4ed26c6..0570d50 100644
--- a/avi2swf/Makefile.in
+++ b/avi2swf/Makefile.in
@@ -8,20 +8,20 @@ VIDEO_CFLAGS=@VIDEO_CFLAGS@
 
 all: avi2swf$(E)
 
-videoreader_avifile.o: videoreader_avifile.cc videoreader_avifile.hh
+videoreader_avifile.$(O): videoreader_avifile.cc videoreader_avifile.hh
 	$(CC) $(VIDEO_CFLAGS) $< -o $@
 
-videoreader_vfw.o: videoreader_vfw.cc videoreader_vfw.hh
+videoreader_vfw.$(O): videoreader_vfw.cc videoreader_vfw.hh
 	$(CC) $(VIDEO_CFLAGS) $< -o $@
 
-avi2swf.o: avi2swf.cc videoreader_vfw.hh videoreader_avifile.hh
+avi2swf.$(O): avi2swf.cc videoreader_vfw.hh videoreader_avifile.hh
 	$(CC) $< -o $@
 
-v2swf.o: v2swf.c ../lib/q.h
+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)
+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)
 	$(STRIP) avi2swf$(E)
 
 install:
@@ -33,7 +33,7 @@ uninstall:
 	@file=avi2swf;$(UNINSTALL_BIN);$(UNINSTALL_MAN1)
 
 clean: 
-	rm -f *.o *.lo *.a *.la avi2swf gmon.out
+	rm -f *.o *.obj *.lo *.a *.la avi2swf gmon.out
 
 doc:
 	perl ../parsedoc.pl avi2swf.doc
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 46de855..5fd2c2a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,25 +3,25 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../Makefile.common
 
-all: librfxswf.a q.o
+all: librfxswf.a q.$(O)
 
 lame_objects = @lame_objects@
 
-h263_objects = h.263/dct.o h.263/h263tables.o h.263/swfvideo.o
-actioncompiler_objects = action/assembler.o action/compile.o action/lex.swf4.o action/lex.swf5.o action/libming.o action/swf4compiler.tab.o action/swf5compiler.tab.o action/actioncompiler.o
+h263_objects = h.263/dct.$(O) h.263/h263tables.$(O) h.263/swfvideo.$(O)
+actioncompiler_objects = action/assembler.$(O) action/compile.$(O) action/lex.swf4.$(O) action/lex.swf5.$(O) action/libming.$(O) action/swf4compiler.tab.$(O) action/swf5compiler.tab.$(O) action/actioncompiler.$(O)
 rfxswf_modules =  modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swffont.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c modules/swfdraw.c modules/swfrender.c h.263/swfvideo.c
 
-bitio.o: bitio.c bitio.h
+bitio.$(O): bitio.c bitio.h
 	$(C) bitio.c -o $@
-drawer.o: drawer.c drawer.h
+drawer.$(O): drawer.c drawer.h
 	$(C) drawer.c -o $@
-q.o: q.c q.h $(top_builddir)/config.h
+q.$(O): q.c q.h $(top_builddir)/config.h
 	$(C) q.c -o $@
-MD5.o: MD5.c MD5.h
+MD5.$(O): MD5.c MD5.h
 	$(C) MD5.c -o $@
-log.o: log.c log.h
+log.$(O): log.c log.h
 	$(C) log.c -o $@
-rfxswf.o: rfxswf.c rfxswf.h drawer.h bitio.h log.h MD5.h $(rfxswf_modules) $(top_builddir)/config.h
+rfxswf.$(O): rfxswf.c rfxswf.h drawer.h bitio.h log.h MD5.h $(rfxswf_modules) $(top_builddir)/config.h
 	$(C) rfxswf.c -o $@
 
 $(lame_objects):
@@ -29,22 +29,22 @@ $(lame_objects):
 $(actioncompiler_objects):
 	cd action;make all;cd ..
 
-h.263/dct.o:  h.263/dct.c h.263/dct.h
-	$(C) h.263/dct.c -o h.263/dct.o
-h.263/h263tables.o: h.263/h263tables.c h.263/h263tables.h
-	$(C) h.263/h263tables.c -o h.263/h263tables.o
-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
+h.263/dct.$(O):  h.263/dct.c h.263/dct.h
+	$(C) h.263/dct.c -o h.263/dct.$(O)
+h.263/h263tables.$(O): h.263/h263tables.c h.263/h263tables.h
+	$(C) h.263/h263tables.c -o h.263/h263tables.$(O)
+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: 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)
+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:
 
 clean: 
-	rm -f *.o *.lo *.a *.la gmon.out
+	rm -f *.o *.obj *.lo *.a *.la gmon.out
 	cd lame && $(MAKE) clean && cd .. || true
 	cd h.263 && $(MAKE) clean && cd ..
 	cd action && $(MAKE) clean && cd ..
diff --git a/lib/action/Makefile.in b/lib/action/Makefile.in
index bb11e4b..7babed4 100755
--- a/lib/action/Makefile.in
+++ b/lib/action/Makefile.in
@@ -8,9 +8,9 @@ include ../../Makefile.common
 # In case we need to get more information out of flex
 #FLEXDEBUG = -d
 
-OBJECTS = compile.o \
-          lex.swf4.o lex.swf5.o swf5compiler.tab.o swf4compiler.tab.o \
-          assembler.o libming.o actioncompiler.o
+OBJECTS = compile.$(O) \
+          lex.swf4.$(O) lex.swf5.$(O) swf5compiler.tab.$(O) swf4compiler.tab.$(O) \
+          assembler.$(O) libming.$(O) actioncompiler.$(O)
 
 COMPILER_FILES = action.h assembler.c assembler.h compile.c compile.h \
 		 listaction.c swf4compiler.flex swf4compiler.y swf5compiler.flex swf5compiler.y
@@ -42,52 +42,52 @@ lex.swf5.c: swf5compiler.flex swf5compiler.tab.h
 
 # === OBJECTS ===
 
-lex.swf4.o: lex.swf4.c
-	$(C) lex.swf4.c -o lex.swf4.o
+lex.swf4.$(O): lex.swf4.c
+	$(C) lex.swf4.c -o lex.swf4.$(O)
 
-lex.swf5.o: lex.swf5.c
-	$(C) lex.swf5.c -o lex.swf5.o
+lex.swf5.$(O): lex.swf5.c
+	$(C) lex.swf5.c -o lex.swf5.$(O)
 
-compile.o: compile.c compile.h libming.h action.h blocks/error.h
-	$(C) compile.c -o compile.o
+compile.$(O): compile.c compile.h libming.h action.h blocks/error.h
+	$(C) compile.c -o compile.$(O)
 
-listaction.o: listaction.c action.h compile.h
-	$(C) listaction.c -o listaction.o
+listaction.$(O): listaction.c action.h compile.h
+	$(C) listaction.c -o listaction.$(O)
 
-actioncompiler.o: actioncompiler.c compile.h action.h libming.h
-	$(C) actioncompiler.c -o actioncompiler.o
+actioncompiler.$(O): actioncompiler.c compile.h action.h libming.h
+	$(C) actioncompiler.c -o actioncompiler.$(O)
 
-assembler.o: assembler.c compile.h action.h assembler.h
-	$(C) assembler.c -o assembler.o
+assembler.$(O): assembler.c compile.h action.h assembler.h
+	$(C) assembler.c -o assembler.$(O)
 
-swf4compiler.tab.o: swf4compiler.tab.c compile.h action.h assembler.h
-	$(C) swf4compiler.tab.c -o swf4compiler.tab.o
+swf4compiler.tab.$(O): swf4compiler.tab.c compile.h action.h assembler.h
+	$(C) swf4compiler.tab.c -o swf4compiler.tab.$(O)
 
-swf5compiler.tab.o: swf5compiler.tab.c compile.h action.h assembler.h
-	$(C) swf5compiler.tab.c -o swf5compiler.tab.o
+swf5compiler.tab.$(O): swf5compiler.tab.c compile.h action.h assembler.h
+	$(C) swf5compiler.tab.c -o swf5compiler.tab.$(O)
 
-libming.o: libming.c libming.h
-	$(C) libming.c -o libming.o
+libming.$(O): libming.c libming.h
+	$(C) libming.c -o libming.$(O)
 
 # === TESTING ===
 
-test.o: test.c actioncompiler.h
-	$(C) test.c -o test.o
+test.$(O): test.c actioncompiler.h
+	$(C) test.c -o test.$(O)
 
-main.o: main.c
-	$(C) main.c -o main.o
+main.$(O): main.c
+	$(C) main.c -o main.$(O)
 
-O = compile.o listaction.o lex.swf4.o lex.swf5.o swf5compiler.tab.o swf4compiler.tab.o assembler.o actioncompiler.o
-main: main.o $(O)
-	$(L) -o main main.o $(O) $(LIBS)
+OBJS = compile.$(O) listaction.$(O) lex.swf4.$(O) lex.swf5.$(O) swf5compiler.tab.$(O) swf4compiler.tab.$(O) assembler.$(O) actioncompiler.$(O)
+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
+test: test.$(O) $(OBJECTS)
+	$(L) -o test $(OBJECTS) test.$(O) ../librfxswf.a -lm -ljpeg -lz -lt1 -lfreetype
 
 # === CLEANING ===
 
 clean:
-	rm -f $(OBJECTS) compiler compiler.exe core test main main.o *~ gmon.out
+	rm -f $(OBJECTS) compiler compiler.exe core test main main.$(O) *~ gmon.out
 
 distclean: clean
 	rm -f $(GENERATED) swf*compiler.tab.* lex*.c 
diff --git a/lib/lame/Makefile.in b/lib/lame/Makefile.in
index 9def8dc..845face 100644
--- a/lib/lame/Makefile.in
+++ b/lib/lame/Makefile.in
@@ -3,47 +3,47 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
 
-lame_objects =  psymodel.o fft.o newmdct.o quantize.o takehiro.o reservoir.o quantize_pvt.o vbrquantize.o encoder.o id3tag.o version.o tables.o util.o bitstream.o set_get.o VbrTag.o lame.o
+lame_objects =  psymodel.$(O) fft.$(O) newmdct.$(O) quantize.$(O) takehiro.$(O) reservoir.$(O) quantize_pvt.$(O) vbrquantize.$(O) encoder.$(O) id3tag.$(O) version.$(O) tables.$(O) util.$(O) bitstream.$(O) set_get.$(O) VbrTag.$(O) lame.$(O)
 
 all: $(lame_objects)
 
-psymodel.o: psymodel.c 
+psymodel.$(O): psymodel.c 
 	$(C) psymodel.c -o $@
-fft.o: fft.c 
+fft.$(O): fft.c 
 	$(C) fft.c -o $@
-newmdct.o: newmdct.c 
+newmdct.$(O): newmdct.c 
 	$(C) newmdct.c -o $@
-quantize.o: quantize.c 
+quantize.$(O): quantize.c 
 	$(C) quantize.c -o $@
-takehiro.o: takehiro.c 
+takehiro.$(O): takehiro.c 
 	$(C) takehiro.c -o $@
-reservoir.o: reservoir.c 
+reservoir.$(O): reservoir.c 
 	$(C) reservoir.c -o $@
-quantize_pvt.o: quantize_pvt.c 
+quantize_pvt.$(O): quantize_pvt.c 
 	$(C) quantize_pvt.c -o $@
-vbrquantize.o: vbrquantize.c 
+vbrquantize.$(O): vbrquantize.c 
 	$(C) vbrquantize.c -o $@
-encoder.o: encoder.c 
+encoder.$(O): encoder.c 
 	$(C) encoder.c -o $@
-id3tag.o: id3tag.c 
+id3tag.$(O): id3tag.c 
 	$(C) id3tag.c -o $@
-version.o: version.c 
+version.$(O): version.c 
 	$(C) version.c -o $@
-tables.o: tables.c 
+tables.$(O): tables.c 
 	$(C) tables.c -o $@
-util.o: util.c 
+util.$(O): util.c 
 	$(C) util.c -o $@
-bitstream.o: bitstream.c 
+bitstream.$(O): bitstream.c 
 	$(C) bitstream.c -o $@
-set_get.o: set_get.c 
+set_get.$(O): set_get.c 
 	$(C) set_get.c -o $@
-VbrTag.o: VbrTag.c 
+VbrTag.$(O): VbrTag.c 
 	$(C) VbrTag.c -o $@
-lame.o: lame.c
+lame.$(O): lame.c
 	$(C) lame.c -o $@
 
 install:
 uninstall:
 clean: 
-	rm -f *.o *.lo *.a *.la gmon.out
+	rm -f *.o *.obj *.lo *.a *.la gmon.out
 
diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index 9c2ec0d..9f0baa9 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -6,28 +6,28 @@ include ../../Makefile.common
 all: SWF.$(SLEXT)
 exe: mypython$(E) swfpython$(E) testmem$(E)
 
-primitives.o: primitives.c primitives.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c primitives.c -o primitives.o
-tagmap.o: tagmap.c tagmap.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tagmap.c -o tagmap.o
-taglist.o: taglist.c taglist.h tagmap.h tag.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c taglist.c -o taglist.o
-tag.o: tag.c tag.h tagmap.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tag.c -o tag.o
-tags.o: tags.c tags.h tagmap.h tag.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tags.c -o tags.o
-image.o: image.c image.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c image.c -o image.o
-action.o: action.c action.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c action.c -o action.o
-pyutils.o: pyutils.c pyutils.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c pyutils.c -o pyutils.o
+primitives.$(O): primitives.c primitives.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c primitives.c -o primitives.$(O)
+tagmap.$(O): tagmap.c tagmap.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tagmap.c -o tagmap.$(O)
+taglist.$(O): taglist.c taglist.h tagmap.h tag.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c taglist.c -o taglist.$(O)
+tag.$(O): tag.c tag.h tagmap.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tag.c -o tag.$(O)
+tags.$(O): tags.c tags.h tagmap.h tag.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c tags.c -o tags.$(O)
+image.$(O): image.c image.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c image.c -o image.$(O)
+action.$(O): action.c action.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c action.c -o action.$(O)
+pyutils.$(O): pyutils.c pyutils.h
+	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c pyutils.c -o pyutils.$(O)
 
-SWF.o: SWF.c pyutils.h primitives.h taglist.h
-	$(C) -Wall -Wno-unused -fPIC $(PYTHON_INCLUDES) -c SWF.c -o SWF.o
+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:
@@ -35,7 +35,7 @@ install:
 # for debugging:
 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
+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)
 testmem$(E): testmem.c Makefile
 	$(L) $(PYTHON_INCLUDES) testmem.c -o testmem$(E) $(PYTHON_LIB) $(LIBS)
@@ -59,6 +59,6 @@ test5: SWF.$(SLEXT)
 test6: SWF.$(SLEXT)
 	./test_sprite.py
 clean:
-	rm -f *.o *.so mypython swfpython
+	rm -f *.o *.obj *.so mypython swfpython
 
 .PHONY: test,test1,test2
diff --git a/pdf2swf/Makefile.in b/pdf2swf/Makefile.in
index f5efde5..7614156 100644
--- a/pdf2swf/Makefile.in
+++ b/pdf2swf/Makefile.in
@@ -7,29 +7,29 @@ all: pdf2swf$(E)
 
 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
 
-SWFOutputDev.o: swfoutput.h SWFOutputDev.cc
+SWFOutputDev.$(O): swfoutput.h SWFOutputDev.cc
 	$(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib -Ixpdf SWFOutputDev.cc -o $@
-spline.o: spline.cc spline.h
+spline.$(O): spline.cc spline.h
 	$(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib spline.cc -o $@
-encodings.o: encodings.cc
+encodings.$(O): encodings.cc
 	$(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib encodings.cc -o $@
-swfoutput.o: swfoutput.cc swfoutput.h spline.h
+swfoutput.$(O): swfoutput.cc swfoutput.h spline.h
 	$(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib swfoutput.cc -o $@
-pdf2swf.o: pdf2swf.cc SWFOutputDev.h
+pdf2swf.$(O): pdf2swf.cc SWFOutputDev.h
 	$(CC) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" -I../lib pdf2swf.cc -o $@
 
-pdf2swf.a: SWFOutputDev.o swfoutput.o encodings.o spline.o 
-	$(AR) r pdf2swf.a SWFOutputDev.o swfoutput.o encodings.o spline.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$(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: 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: 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 *.lo *.a *.la pdf2swf font2swf gmon.out
+	rm -f *.o *.obj *.lo *.a *.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 b9d52e5..0b8055c 100644
--- a/pdf2swf/xpdf/Makefile.in
+++ b/pdf2swf/xpdf/Makefile.in
@@ -5,101 +5,101 @@ include ../../Makefile.common
 
 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 \
-		  OutputDev.o PDFDoc.o Error.o Stream.o Object.o \
-		  Decrypt.o Array.o XRef.o Dict.o Parser.o \
-		  Lexer.o Outline.o PDFDocEncoding.o Catalog.o \
-		  Link.o GlobalParams.o JBIG2Stream.o Page.o JPXStream.o \
-		  JArithmeticDecoder.o Gfx.o GfxFont.o CMap.o CharCodeToUnicode.o \
-		  PSTokenizer.o FontEncodingTables.o BuiltinFont.o BuiltinFontTables.o \
-		  GfxState.o Function.o Annot.o NameToCharCode.o UnicodeMap.o
+libpdf_objects =  GHash.$(O) GList.$(O) GString.$(O) gmem.$(O) gfile.$(O) \
+		  FoFiTrueType.$(O) FoFiType1.$(O) FoFiType1C.$(O) FoFiBase.$(O) FoFiEncodings.$(O) \
+		  OutputDev.$(O) PDFDoc.$(O) Error.$(O) Stream.$(O) Object.$(O) \
+		  Decrypt.$(O) Array.$(O) XRef.$(O) Dict.$(O) Parser.$(O) \
+		  Lexer.$(O) Outline.$(O) PDFDocEncoding.$(O) Catalog.$(O) \
+		  Link.$(O) GlobalParams.$(O) JBIG2Stream.$(O) Page.$(O) JPXStream.$(O) \
+		  JArithmeticDecoder.$(O) Gfx.$(O) GfxFont.$(O) CMap.$(O) CharCodeToUnicode.$(O) \
+		  PSTokenizer.$(O) FontEncodingTables.$(O) BuiltinFont.$(O) BuiltinFontTables.$(O) \
+		  GfxState.$(O) Function.$(O) Annot.$(O) NameToCharCode.$(O) UnicodeMap.$(O)
 
-UnicodeMap.o: UnicodeMap.cc
+UnicodeMap.$(O): UnicodeMap.cc
 	$(CC) -I./ UnicodeMap.cc -o $@
-NameToCharCode.o: NameToCharCode.cc
+NameToCharCode.$(O): NameToCharCode.cc
 	$(CC) -I./ NameToCharCode.cc -o $@
-Annot.o: Annot.cc
+Annot.$(O): Annot.cc
 	$(CC) -I./ Annot.cc -o $@
-Function.o: Function.cc
+Function.$(O): Function.cc
 	$(CC) -I./ Function.cc -o $@
-BuiltinFontTables.o: BuiltinFontTables.cc
+BuiltinFontTables.$(O): BuiltinFontTables.cc
 	$(CC) -I./ BuiltinFontTables.cc -o $@
-BuiltinFont.o: BuiltinFont.cc
+BuiltinFont.$(O): BuiltinFont.cc
 	$(CC) -I./ BuiltinFont.cc -o $@
-FontEncodingTables.o: FontEncodingTables.cc
+FontEncodingTables.$(O): FontEncodingTables.cc
 	$(CC) -I./ FontEncodingTables.cc -o $@
-PSTokenizer.o: PSTokenizer.cc
+PSTokenizer.$(O): PSTokenizer.cc
 	$(CC) -I./ PSTokenizer.cc -o $@
-CharCodeToUnicode.o: CharCodeToUnicode.cc
+CharCodeToUnicode.$(O): CharCodeToUnicode.cc
 	$(CC) -I./ CharCodeToUnicode.cc -o $@
-CMap.o: CMap.cc
+CMap.$(O): CMap.cc
 	$(CC) -I./ CMap.cc -o $@
-GfxFont.o: GfxFont.cc
+GfxFont.$(O): GfxFont.cc
 	$(CC) -I./ GfxFont.cc -o $@
-Gfx.o: Gfx.cc
+Gfx.$(O): Gfx.cc
 	$(CC) -I./ Gfx.cc -o $@
-GfxState.o: GfxState.cc
+GfxState.$(O): GfxState.cc
 	$(CC) -I./ GfxState.cc -o $@
-JArithmeticDecoder.o: JArithmeticDecoder.cc
+JArithmeticDecoder.$(O): JArithmeticDecoder.cc
 	$(CC) -I./ JArithmeticDecoder.cc -o $@
-JPXStream.o: JPXStream.cc
+JPXStream.$(O): JPXStream.cc
 	$(CC) -I./ JPXStream.cc -o $@
-GlobalParams.o: GlobalParams.cc GlobalParams.h
+GlobalParams.$(O): GlobalParams.cc GlobalParams.h
 	$(CC) -I./ GlobalParams.cc -o $@
-JBIG2Stream.o: JBIG2Stream.cc
+JBIG2Stream.$(O): JBIG2Stream.cc
 	$(CC) -I./ JBIG2Stream.cc -o $@
-Page.o: Page.cc
+Page.$(O): Page.cc
 	$(CC) -I./ Page.cc -o $@
-Link.o: Link.cc
+Link.$(O): Link.cc
 	$(CC) -I./ Link.cc -o $@
-Catalog.o: Catalog.cc
+Catalog.$(O): Catalog.cc
 	$(CC) -I./ Catalog.cc -o $@
-PDFDocEncoding.o: PDFDocEncoding.cc
+PDFDocEncoding.$(O): PDFDocEncoding.cc
 	$(CC) -I./ PDFDocEncoding.cc -o $@
-Outline.o: Outline.cc
+Outline.$(O): Outline.cc
 	$(CC) -I./ Outline.cc -o $@
-Lexer.o: Lexer.cc
+Lexer.$(O): Lexer.cc
 	$(CC) -I./ Lexer.cc -o $@
-Parser.o: Parser.cc
+Parser.$(O): Parser.cc
 	$(CC) -I./ Parser.cc -o $@
-XRef.o: XRef.cc
+XRef.$(O): XRef.cc
 	$(CC) -I./ XRef.cc -o $@
-Array.o: Array.cc
+Array.$(O): Array.cc
 	$(CC) -I./ Array.cc -o $@
-Dict.o: Dict.cc
+Dict.$(O): Dict.cc
 	$(CC) -I./ Dict.cc -o $@
-Decrypt.o: Decrypt.cc
+Decrypt.$(O): Decrypt.cc
 	$(CC) -I./ Decrypt.cc -o $@
-Object.o: Object.cc
+Object.$(O): Object.cc
 	$(CC) -I./ Object.cc -o $@
-Error.o: Error.cc aconf.h
+Error.$(O): Error.cc aconf.h
 	$(CC) -I./ Error.cc -o $@
-Stream.o: Stream.cc
+Stream.$(O): Stream.cc
 	$(CC) -I./ Stream.cc -o $@
-PDFDoc.o: PDFDoc.cc
+PDFDoc.$(O): PDFDoc.cc
 	$(CC) -I./ PDFDoc.cc -o $@
-OutputDev.o: OutputDev.cc GfxState.h Stream.h Object.h OutputDev.h gtypes.h CharTypes.h
+OutputDev.$(O): OutputDev.cc GfxState.h Stream.h Object.h OutputDev.h gtypes.h CharTypes.h
 	$(CC) -I./ OutputDev.cc -o $@
-FoFiBase.o: FoFiBase.cc
+FoFiBase.$(O): FoFiBase.cc
 	$(CC) -I./ FoFiBase.cc -o $@
-FoFiTrueType.o: FoFiTrueType.cc FoFiBase.h
+FoFiTrueType.$(O): FoFiTrueType.cc FoFiBase.h
 	$(CC) -I./ FoFiTrueType.cc -o $@
-FoFiEncodings.o: FoFiEncodings.cc FoFiEncodings.h
+FoFiEncodings.$(O): FoFiEncodings.cc FoFiEncodings.h
 	$(CC) -I./ FoFiEncodings.cc -o $@
-FoFiType1C.o: FoFiType1C.cc FoFiBase.h
+FoFiType1C.$(O): FoFiType1C.cc FoFiBase.h
 	$(CC) -I./ FoFiType1C.cc -o $@
-FoFiType1.o: FoFiType1.cc FoFiBase.h
+FoFiType1.$(O): FoFiType1.cc FoFiBase.h
 	$(CC) -I./ FoFiType1.cc -o $@
-GList.o: GList.cc
+GList.$(O): GList.cc
 	$(CC) -I./ GList.cc -o $@
-GString.o: GString.cc
+GString.$(O): GString.cc
 	$(CC) -I./ GString.cc -o $@
-GHash.o: GHash.cc
+GHash.$(O): GHash.cc
 	$(CC) -I./ GHash.cc -o $@
-gfile.o: gfile.cc
+gfile.$(O): gfile.cc
 	$(CC) -I./ gfile.cc -o $@
-gmem.o: gmem.c
+gmem.$(O): gmem.c
 	$(C) -I./ gmem.c -o $@
 
 libpdf.a: $(libpdf_objects)
@@ -110,5 +110,5 @@ install:
 uninstall:
 
 clean: 
-	rm -f *.o *.lo *.a *.la gmon.out
+	rm -f *.o *.obj *.lo *.a *.la gmon.out
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 4bc6b44..3bae079 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7,64 +7,64 @@ programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) sw
 
 all: $(programs)
 
-wav2swf.o: wav2swf.c wav.h
+wav2swf.$(O): wav2swf.c wav.h
 	$(C) wav2swf.c -o $@
-wav.o: wav.c wav.h
+wav.$(O): wav.c wav.h
 	$(C) wav.c -o $@
-png2swf.o: png2swf.c
+png2swf.$(O): png2swf.c
 	$(C) png2swf.c -o $@
-swfcombine.o: swfcombine.c
+swfcombine.$(O): swfcombine.c
 	$(C) swfcombine.c -o $@
-swfdump.o: swfdump.c
+swfdump.$(O): swfdump.c
 	$(C) swfdump.c -o $@
-swfextract.o: swfextract.c
+swfextract.$(O): swfextract.c
 	$(C) swfextract.c -o $@
-swfstrings.o: swfstrings.c
+swfstrings.$(O): swfstrings.c
 	$(C) swfstrings.c -o $@
-swfbbox.o: swfbbox.c
+swfbbox.$(O): swfbbox.c
 	$(C) swfbbox.c -o $@
-jpeg2swf.o: jpeg2swf.c
+jpeg2swf.$(O): jpeg2swf.c
 	$(C) jpeg2swf.c -o $@
-font2swf.o: font2swf.c
+font2swf.$(O): font2swf.c
 	$(C) font2swf.c -o $@
-swfc.o: swfc.c parser.h ../lib/q.h
+swfc.$(O): swfc.c parser.h ../lib/q.h
 	$(C) swfc.c -o $@
-parser.o: parser.yy.c parser.h ../lib/q.h
+parser.$(O): parser.yy.c parser.h ../lib/q.h
 	$(C) parser.yy.c -o $@
 
 # TODO: include the following rule only if lex is available
 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:
@@ -76,7 +76,7 @@ uninstall:
 	@for file in $(programs); do $(UNINSTALL_BIN);$(UNINSTALL_MAN1);done
 
 clean: 
-	rm -f *.o *.lo *.a *.la *~ gmon.out
+	rm -f *.o *.obj *.lo *.a *.la *~ gmon.out
 	rm -f swfbbox swfdump wav2swf png2swf swfcombine swfextract swfstrings png2swf jpeg2swf swfc font2swf
 	@rm -f swfbbox.exe swfdump.exe wav2swf.exe png2swf.exe swfcombine.exe swfextract.exe swfstrings.exe png2swf.exe jpeg2swf.exe swfc.exe font2swf.exe
 	@rm -f swfbbox$(E) swfdump$(E) wav2swf$(E) png2swf$(E) swfcombine$(E) swfextract$(E) swfstrings$(E) png2swf$(E) jpeg2swf$(E) swfc$(E) font2swf$(E)
diff --git a/swfs/Makefile.in b/swfs/Makefile.in
index 3a6bbde..b18cc3c 100644
--- a/swfs/Makefile.in
+++ b/swfs/Makefile.in
@@ -7,19 +7,19 @@ all: simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf
 
 programs = simple_viewer$(E) keyboard_viewer$(E) PreLoaderTemplate$(E)
 
-simple_viewer.o: simple_viewer.c
+simple_viewer.$(O): simple_viewer.c
 	$(C) -I../lib simple_viewer.c -o $@
-keyboard_viewer.o: keyboard_viewer.c
+keyboard_viewer.$(O): keyboard_viewer.c
 	$(C) -I../lib keyboard_viewer.c -o $@
-PreLoaderTemplate.o: PreLoaderTemplate.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 *.lo *.a *.la gmon.out 
+	rm -f *.o *.obj *.lo *.a *.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