X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=swfs%2FMakefile.in;h=9b1fce2089220ba4e7f19aff946d6a7af60b28f7;hb=8e46b01f07a687310ed1ce77416df14464e4627c;hp=65fde3d1870b4db5780cd7c2aa09b721e0d35b19;hpb=01205949048b35fe40745577fce47e8fa931844d;p=swftools.git

diff --git a/swfs/Makefile.in b/swfs/Makefile.in
index 65fde3d..9b1fce2 100644
--- a/swfs/Makefile.in
+++ b/swfs/Makefile.in
@@ -56,7 +56,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-CC = @CC@
 CPP = @CPP@
 CXX = @CXX@
 EXEEXT = @EXEEXT@
@@ -71,18 +70,20 @@ USE_GZIP = @USE_GZIP@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 
-bin_PROGRAMS = simple_viewer PreLoaderTemplate
+bin_PROGRAMS = keyboard_viewer simple_viewer PreLoaderTemplate
 LDADD = 
 simple_viewer_SOURCES = simple_viewer.c
-simple_viewer_LDADD = ../lib/rfxswf.o
-PreLoaderTemplate_SOURCES = simple_viewer.c
-PreLoaderTemplate_LDADD = ../lib/rfxswf.o
+simple_viewer_LDADD = ../lib/librfxswf.a
+keyboard_viewer_SOURCES = keyboard_viewer.c
+keyboard_viewer_LDADD = ../lib/librfxswf.a
+PreLoaderTemplate_SOURCES = PreLoaderTemplate.c
+PreLoaderTemplate_LDADD = ../lib/librfxswf.a
 INCLUDES = -I../lib
-pkgdata_DATA = simple_viewer.swf PreLoaderTemplate.swf swft_loader.swf tessel_loader.swf
+pkgdata_DATA = simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf swft_loader.swf tessel_loader.swf
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  simple_viewer$(EXEEXT) PreLoaderTemplate$(EXEEXT)
+bin_PROGRAMS =  simple_viewer$(EXEEXT) keyboard_viewer.swf$(EXEEXT) PreLoaderTemplate$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -91,14 +92,17 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 simple_viewer_OBJECTS =  simple_viewer.o
-simple_viewer_DEPENDENCIES =  ../lib/rfxswf.o
+simple_viewer_DEPENDENCIES =  ../lib/librfxswf.a
 simple_viewer_LDFLAGS = 
+keyboard_viewer_OBJECTS =  keyboard_viewer.o
+keyboard_viewer_DEPENDENCIES =  ../lib/librfxswf.a
+keyboard_viewer_LDFLAGS = 
 PreLoaderTemplate_OBJECTS =  PreLoaderTemplate.o
-PreLoaderTemplate_DEPENDENCIES =  ../lib/rfxswf.o
+PreLoaderTemplate_DEPENDENCIES =  ../lib/librfxswf.a
 PreLoaderTemplate_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
+CC = @CC@ $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = @CC@
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(pkgdata_DATA)
 
@@ -109,9 +113,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/simple_viewer.P .deps/PreLoaderTemplate.P
-SOURCES = $(simple_viewer_SOURCES) $(PreLoaderTemplate_SOURCES)
-OBJECTS = $(simple_viewer_OBJECTS) $(PreLoaderTemplate_OBJECTS)
+DEP_FILES =  .deps/simple_viewer.P .deps/PreLoaderTemplate.P .deps/keyboard_viewer.P
+SOURCES = $(keyboard_viewer_SOURCES) $(simple_viewer_SOURCES) $(PreLoaderTemplate_SOURCES)
+OBJECTS = $(keyboard_viewer_OBJECTS) $(simple_viewer_OBJECTS) $(PreLoaderTemplate_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -124,8 +128,9 @@ clean-binPROGRAMS:
 
 distclean-binPROGRAMS:
 
-maintainer-clean-binPROGRAMS:
-
+keyboard_viewer.swf: keyboard_viewer
+	echo Calling ./keybard_viewer to create keyboard_viewer.swf
+	./keyboard_viewer
 simple_viewer.swf: simple_viewer
 	echo Calling ./simple_viewer to create simple_viewer.swf
 	./simple_viewer
@@ -134,10 +139,10 @@ PreLoaderTemplate.swf: PreLoaderTemplate
 	./PreLoaderTemplate
 
 .s.o:
-	$(COMPILE) -c $<
+	$(CC) -c $<
 
 .S.o:
-	$(COMPILE) -c $<
+	$(CC) -c $<
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
@@ -147,12 +152,14 @@ clean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
-
 simple_viewer$(EXEEXT): $(simple_viewer_OBJECTS) $(simple_viewer_DEPENDENCIES)
 	@rm -f simple_viewer$(EXEEXT)
 	$(LINK) $(simple_viewer_LDFLAGS) $(simple_viewer_OBJECTS) $(simple_viewer_LDADD) $(LIBS)
 
+keyboard_viewer$(EXEEXT): $(keyboard_viewer_OBJECTS) $(keyboard_viewer_DEPENDENCIES)
+	@rm -f keyboard_viewer$(EXEEXT)
+	$(LINK) $(keyboard_viewer_LDFLAGS) $(keyboard_viewer_OBJECTS) $(keyboard_viewer_LDADD) $(LIBS)
+
 PreLoaderTemplate$(EXEEXT): $(PreLoaderTemplate_OBJECTS) $(PreLoaderTemplate_DEPENDENCIES)
 	@rm -f PreLoaderTemplate$(EXEEXT)
 	$(LINK) $(PreLoaderTemplate_LDFLAGS) $(PreLoaderTemplate_OBJECTS) $(PreLoaderTemplate_LDADD) $(LIBS)
@@ -169,8 +176,12 @@ install-pkgdataDATA: $(pkgdata_DATA)
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; fi; \
 	done
-	$(LN_S) $(DESTDIR)$(pkgdatadir)/simple_viewer.swf $(DESTDIR)$(pkgdatadir)/default_viewer.swf
-	$(LN_S) $(DESTDIR)$(pkgdatadir)/tessel_loader.swf $(DESTDIR)$(pkgdatadir)/default_loader.swf
+	test -f $(DESTDIR)$(pkgdatadir)/default_viewer.swf || \
+	    $(LN_S) $(DESTDIR)$(pkgdatadir)/simple_viewer.swf $(DESTDIR)$(pkgdatadir)/default_viewer.swf; \
+	test -f $(DESTDIR)$(pkgdatadir)/default_loader.swf || \
+	    $(LN_S) $(DESTDIR)$(pkgdatadir)/tessel_loader.swf $(DESTDIR)$(pkgdatadir)/default_loader.swf; \
+
+uninstall-binPROGRAMS:
 
 uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
@@ -207,8 +218,6 @@ clean-tags:
 distclean-tags:
 	-rm -f TAGS ID
 
-maintainer-clean-tags:
-
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = swfs
@@ -230,8 +239,6 @@ distdir: $(DISTFILES)
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
--include $(DEP_FILES)
-
 mostlyclean-depend:
 
 clean-depend:
@@ -239,26 +246,15 @@ clean-depend:
 distclean-depend:
 	-rm -rf .deps
 
-maintainer-clean-depend:
-
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(CC) -c $<'; \
+	$(CC) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	    >> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -292,7 +288,6 @@ distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
-maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
@@ -308,15 +303,6 @@ distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
 .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \