X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2FMakefile.in;h=42c872fc1cddcdff3c555b779fd211cd4009f899;hb=ab6275847891c4ac549e972bcf44664b11a1f572;hp=0059493927ad6e903b19cb0604a3c9b1a14a79b2;hpb=fb427c846bf5e59ddd76cac9e9140b119405b511;p=swftools.git

diff --git a/src/Makefile.in b/src/Makefile.in
index 0059493..42c872f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4,6 +4,7 @@ top_srcdir = @top_srcdir@
 include ../Makefile.common
 
 programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) @PDF2SWF@
+opt_programs = swfrender$(E) swfbytes$(E)
 
 all: $(programs)
 
@@ -90,10 +91,10 @@ jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
 	$(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
 swfrender$(E): swfrender.$(O) ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/swf/swf.$(O) ../lib/libbase$(A) 
-	$(L) swfrender.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/swf/swf.$(O) ../lib/libbase$(A) $(LIBS) 
+	$(L) swfrender.$(O) -o $@ ../lib/swf/swf.$(O) ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/libbase$(A) $(LIBS) 
 	$(STRIP) $@
 
-PDF2SWF_OBJ=../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/devices/arts.$(O) ../lib/devices/artsutils.$(O) ../lib/devices/swf.$(O) ../lib/art/libart$(A) ../lib/libgfx$(A) ../lib/libbase$(A)
+PDF2SWF_OBJ=../lib/libpdf$(A) ../lib/devices/polyops.$(O) ../lib/devices/swf.$(O) ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/libbase$(A)
 pdf2swf$(E): pdf2swf.$(O) $(PDF2SWF_OBJ)
 	$(LL) pdf2swf.$(O) -o $@ $(PDF2SWF_OBJ) $(LIBS) $(CXXLIBS)
 	$(STRIP) $@
@@ -104,10 +105,10 @@ swfc$(E): parser.$(O) swfc.$(O) swfc-feedback.$(O) swfc-history.$(O) swfc-interp
 install:
 	$(mkinstalldirs) $(bindir)
 	$(mkinstalldirs) $(man1dir)
-	@for file in $(programs); do $(INSTALL_BIN);$(INSTALL_MAN1);done
+	@for file in $(programs) $(opt_programs); do if test -f $$file;then $(INSTALL_BIN);$(INSTALL_MAN1);fi;done
 	
 uninstall:
-	@for file in $(programs); do $(UNINSTALL_BIN);$(UNINSTALL_MAN1);done
+	@for file in $(programs) $(opt_programs); do $(UNINSTALL_BIN);$(UNINSTALL_MAN1);done
 
 clean: 
 	rm -f *.o *.obj *.lo *.la *~ gmon.out