renaming

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@88 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Example/W3B/Makefile b/Example/interactive/Makefile
similarity index 57%
rename from Example/W3B/Makefile
rename to Example/interactive/Makefile
index e811bca690f92f50fb912385a888d05e47d7ba5a..f7c152e122f90fadd0ba2237b4183986c6d3cf51 100644 (file)
--- a/Example/W3B/Makefile
+++ b/Example/interactive/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 .PHONY: clean install
 
-./w3b: ./w3b.o $(RESFILE)
+./interactive: ./interactive.o $(RESFILE)
        $(CC) -g -o $@ -L ../../Library $^ -lw3
 
 ./%.o: ./%.c
@@ -11,8 +11,8 @@
        $(MAKE) -C .. ./libw3.res WINDRES=$(WINDRES)
 
 clean:
-       rm -f w3b *.o *.so *.core *~ *.exe *.res
+       rm -f interactive *.o *.so *.core *~ *.exe *.res
 
-install: ./w3b
+install: ./interactive
        mkdir -p $(PREFIX)/bin
-       cp ./w3b $(PREFIX)/bin/w3b
+       cp ./interactive $(PREFIX)/bin/interactive

diff --git a/Example/W3B/w3b.c b/Example/interactive/interactive.c
similarity index 100%
rename from Example/W3B/w3b.c
rename to Example/interactive/interactive.c

diff --git a/Makefile b/Makefile
index a7d71a04abaacf8d88e10671bb76fb4d2bd603f3..a7372ae900ff11595242e1c2c70250da6a9b93ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
 
 ./Example: ./Library/w3.dll
        $(MAKE) -C ./Example/fetch CC=$(CC) RESFILE=../libw3.res WINDRES=$(WINDRES) WINDOWS=YES
-       $(MAKE) -C ./Example/W3B CC=$(CC) RESFILE=../libw3.res WINDRES=$(WINDRES) WINDOWS=YES
+       $(MAKE) -C ./Example/interactive CC=$(CC) RESFILE=../libw3.res WINDRES=$(WINDRES) WINDOWS=YES
 
 ./Library/W3Version.h:
        m4 -DSUFFIX=\"W\" ./W3Version.h.p > $@
@@ -73,7 +73,7 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
 
 ./Example: ./Library/libw3.so
        $(MAKE) -C ./Example/fetch CC=$(CC)
-       $(MAKE) -C ./Example/W3B CC=$(CC)
+       $(MAKE) -C ./Example/interactive CC=$(CC)
 
 ./Library/W3Version.h:
        m4 -DSUFFIX=\"\" ./W3Version.h.p > $@
@@ -97,7 +97,7 @@ clean:
        $(MAKE) -C ./Library clean
        $(MAKE) -C ./Example clean
        $(MAKE) -C ./Example/fetch clean
-       $(MAKE) -C ./Example/W3B clean
+       $(MAKE) -C ./Example/interactive clean
 
 install: ./w3.pc
        $(MAKE) -C ./Library install PREFIX=$(PREFIX)
@@ -107,18 +107,18 @@ install: ./w3.pc
 
 archive: all
        mkdir -p w3-$(VERSION)/Library
-       mkdir -p w3-$(VERSION)/Example/W3B
+       mkdir -p w3-$(VERSION)/Example/interactive
        mkdir -p w3-$(VERSION)/Example/fetch
        cp -rf ./Library/*.h w3-$(VERSION)/Library/
 ifdef WINDOWS
        cp ./Library/*.lib w3-$(VERSION)/Library/
        cp ./Library/*.dll w3-$(VERSION)/Library/
        cp ./Example/fetch/fetch.exe w3-$(VERSION)/Example/fetch/
-       cp ./Example/W3B/w3b.exe w3-$(VERSION)/Example/W3B/
+       cp ./Example/interactive/interactive.exe w3-$(VERSION)/Example/interactive/
 else
        cp ./Library/*.so w3-$(VERSION)/Library/
        cp ./Example/fetch/fetch w3-$(VERSION)/Example/fetch/
-       cp ./Example/W3B/w3b w3-$(VERSION)/Example/W3B/
+       cp ./Example/interactive/interactive w3-$(VERSION)/Example/interactive/
 endif
        -mv w3-$(VERSION)/*.h w3-$(VERSION)/Library/
        -mv w3-$(VERSION)/*.so w3-$(VERSION)/Library/