X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=swfs%2FMakefile.in;h=bf411ca62d7bcc538db8ba03df503947f007616a;hb=4372ebe4a0e2197cf8f9e5f7af1decadf7ef44f6;hp=b25dffae95b5c0cd1176546caa684c827791118d;hpb=19054cb97d231d666a6a50e993fa0ad086c9e26e;p=swftools.git

diff --git a/swfs/Makefile.in b/swfs/Makefile.in
index b25dffa..bf411ca 100644
--- a/swfs/Makefile.in
+++ b/swfs/Makefile.in
@@ -5,25 +5,33 @@ include ../Makefile.common
 
 all: simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf
 
-programs = simple_viewer keyboard_viewer PreLoaderTemplate
+programs = simple_viewer$(E) keyboard_viewer$(E) PreLoaderTemplate$(E)
 
-%.o: %.c
-	$(C) -I../lib $< -o $@
+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 $@
 
-%: %.o
-	$(L) $< -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
-	./simple_viewer
+	./simple_viewer$(E) || true
 
 keyboard_viewer.swf: $(programs)
 	@echo Calling ./simple_viewer to create simple_viewer.swf
-	./keyboard_viewer
+	./keyboard_viewer$(E) || true
 
 PreLoaderTemplate.swf: $(programs)
 	@echo Calling ./PreLoaderTemplate to create PreLoaderTemplate.swf
-	./PreLoaderTemplate
+	./PreLoaderTemplate$(E) || true
 
 install:
 	$(mkinstalldirs) $(pkgdatadir)
@@ -33,10 +41,10 @@ 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 || \
-	    $(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; \
+	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 -o -L $(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
@@ -44,7 +52,13 @@ uninstall:
 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/PreLoaderTemplate.swf
 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/tessel_loader.swf
 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/swft_loader.swf
+	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_viewer.swf
+	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_loader.swf
 
 clean: 
-	rm -f *.o *.lo *.a *.la simple_viewer keyboard_viewer PreLoaderTemplate simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf
+	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
+	rm -f simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf