X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=swfs%2FMakefile.in;h=bf411ca62d7bcc538db8ba03df503947f007616a;hp=b18cc3c34651dfc9bd83ff77667951aa7adf2a71;hb=c788b3270c1380af50d9ff83341b81565b74b28f;hpb=2828d9c7bdb68ced20dabb45ffb50ee178cd0015

diff --git a/swfs/Makefile.in b/swfs/Makefile.in
index b18cc3c..bf411ca 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) ../lib/libbase$(A)
+	$(L) simple_viewer.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS) 
+keyboard_viewer$(E): keyboard_viewer.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A) 
+	$(L) keyboard_viewer.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS) 
+PreLoaderTemplate$(E): PreLoaderTemplate.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A) 
+	$(L) PreLoaderTemplate.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS) 
 
 simple_viewer.swf: $(programs)
 	@echo Calling ./keybard_viewer to create keyboard_viewer.swf
@@ -41,9 +41,9 @@ install:
 	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
 	$(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 || \
+	test -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf || \
 	    $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf;
-	test -f $(pkgdatadir)/swfs/default_loader.swf || \
+	test -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf || \
 	    $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf;
 		
 uninstall:
@@ -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