fixing makefiles

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

diff --git a/Example/Makefile b/Example/Makefile
index 6bf8dafd712dbda820141c0185593fa5c7f119ca..ef1b3d282ac79b35d2d7710497ef3088829f8f5e 100644 (file)
--- a/Example/Makefile
+++ b/Example/Makefile
@@ -1,13 +1,10 @@
 # $Id$:
 .PHONY: clean install
 
-ifeq ($(WINDOWS),YES)
-./fetch.exe: ./fetch.c $(RESFILE)
-       $(CC) -o $@ -I ../Library -L ../Library $^ -lw3
-else
+all: ./fetch
+
 ./fetch: ./fetch.c $(RESFILE)
        $(CC) -o $@ -I ../Library -L ../Library $^ -lw3
-endif
 
 ./libw3.res: ./libw3.rc
        $(WINDRES) $< -O coff -o $@

diff --git a/Makefile b/Makefile
index 995104c708d0df0571526e24bb31e5d86fb6c61f..055f3083fb764aa907d9ddabe07efcfd77780476 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,14 +43,14 @@ endif
 ifeq ($(WINDOWS),YES)
 .PHONY: all clean ./Library/w3.dll ./Example/fetch format
 
-ALL := ./Library/w3.dll ./Example/fetch.exe
+ALL := ./Library/w3.dll ./Example
 
 all: ./w3.pc ./Library/W3Version.h $(ALL)
 
 ./Library/w3.dll:
        $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" WINDOWS=YES
 
-./Example/fetch.exe: ./Library/w3.dll
+./Example: ./Library/w3.dll
        $(MAKE) -C ./Example CC=$(CC) fetch.exe RESFILE=./libw3.res WINDRES=$(WINDRES) WINDOWS=YES
 
 ./Library/W3Version.h:
@@ -60,7 +60,7 @@ else
 
 .PHONY: all clean ./Library/libw3.so ./Library/libw3.a ./Example/fetch format
 
-ALL := ./Library/libw3.so ./Library/libw3.a ./Example/fetch
+ALL := ./Library/libw3.so ./Library/libw3.a ./Example
 
 all: ./w3.pc ./Library/W3Version.h $(ALL)
 
@@ -70,7 +70,7 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
 ./Library/libw3.a:
        $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" ./libw3.a
 
-./Example/fetch: ./Library/libw3.so
+./Example: ./Library/libw3.so
        $(MAKE) -C ./Example CC=$(CC) fetch
 
 ./Library/W3Version.h: