moving

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

diff --git a/Example/W3B/Makefile b/Example/W3B/Makefile
new file mode 100644 (file)
index 0000000..af889b4
--- /dev/null
+++ b/Example/W3B/Makefile
@@ -0,0 +1,14 @@
+.PHONY: clean install
+
+./w3b: ./w3b.c $(RESFILE)
+       $(CC) -o $@ -I ../../Library -L ../../Library $^ -lw3
+
+../libw3.res:
+       $(MAKE) -C .. ./libw3.res WINDRES=$(WINDRES)
+
+clean:
+       rm -f w3b *.o *.so *.core *~ *.exe *.res
+
+install: ./w3b
+       mkdir -p $(PREFIX)/bin
+       cp ./w3b $(PREFIX)/bin/w3b

diff --git a/Example/W3B/w3b.c b/Example/W3B/w3b.c
new file mode 100644 (file)
index 0000000..c29e2da
--- /dev/null
+++ b/Example/W3B/w3b.c
@@ -0,0 +1,8 @@
+/*
+ * $Id$
+ *
+ * Simple browser
+ */
+
+int main(){
+}

diff --git a/Example/Makefile b/Example/fetch/Makefile
similarity index 62%
rename from Example/Makefile
rename to Example/fetch/Makefile
index 933a11347cb8e82039a0527a1371bf072846ee61..fdbaaecd2e9b961be6a797dd8bab7fd98d06045d 100644 (file)
--- a/Example/Makefile
+++ b/Example/fetch/Makefile
@@ -2,10 +2,10 @@
 .PHONY: clean install
 
 ./fetch: ./fetch.c $(RESFILE)
-       $(CC) -o $@ -I ../Library -L ../Library $^ -lw3
+       $(CC) -o $@ -I ../../Library -L ../../Library $^ -lw3
 
-./libw3.res: ./libw3.rc
-       $(WINDRES) $< -O coff -o $@
+../libw3.res:
+       $(MAKE) -C .. ./libw3.res WINDRES=$(WINDRES)
 
 clean:
        rm -f fetch *.o *.so *.core *~ *.exe *.res

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

diff --git a/Makefile b/Makefile
index b0c263574c3061411a6c2cc15d553d972282fcbb..f1c10c210bb0fc052663e265be01d11e3ce82367 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
        $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" WINDOWS=YES
 
 ./Example: ./Library/w3.dll
-       $(MAKE) -C ./Example 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/fetch CC=$(CC) RESFILE=../libw3.res WINDRES=$(WINDRES) WINDOWS=YES
+       $(MAKE) -C ./Example/W3B CC=$(CC) RESFILE=../libw3.res WINDRES=$(WINDRES) WINDOWS=YES
 
 ./Library/W3Version.h:
        m4 -DSUFFIX=\"W\" ./W3Version.h.p > $@
@@ -72,8 +72,8 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
        $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" ./libw3.a
 
 ./Example: ./Library/libw3.so
-       $(MAKE) -C ./Example CC=$(CC)
-       $(MAKE) -C ./Example/W3B CC=$(CC) RESFILE=./libw3.res WINDRES=$(WINDRES) WINDOWS=YES
+       $(MAKE) -C ./Example/fetch CC=$(CC)
+       $(MAKE) -C ./Example/W3B CC=$(CC)
 
 ./Library/W3Version.h:
        m4 -DSUFFIX=\"\" ./W3Version.h.p > $@
@@ -96,6 +96,8 @@ clean:
        -rm ./w3.pc w3-*.zip w3-*.tar.gz w3-*.lzh ./Library/W3Version.h
        $(MAKE) -C ./Library clean
        $(MAKE) -C ./Example clean
+       $(MAKE) -C ./Example/fetch clean
+       $(MAKE) -C ./Example/W3B clean
 
 install: ./w3.pc
        $(MAKE) -C ./Library install PREFIX=$(PREFIX)