changed the structure

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

diff --git a/Example/Makefile b/Example/Makefile
index 474244149d1907166b1eb8e5cd5e5584c4a8631b..1087120aa4cc20d06c58ee4d41ab30273f455a96 100644 (file)
--- a/Example/Makefile
+++ b/Example/Makefile
@@ -4,7 +4,7 @@
 ./fetch: ./fetch.c $(RESFILE)
        $(CC) -o $@ -I ../Library -L ../Library $^ -lw3
 
-./fetch.res: ./fetch.rc
+./libw3.res: ./libw3.rc
        $(WINDRES) $< -O coff -o $@
 
 clean:

diff --git a/Example/fetch.rc b/Example/libw3.rc
similarity index 62%
rename from Example/fetch.rc
rename to Example/libw3.rc
index f3653e75ff236148c946c8e159da8dd80ca00512..1f0fe576b797ae90822a06c3ccff9ab2bd831819 100644 (file)
--- a/Example/fetch.rc
+++ b/Example/libw3.rc
@@ -3,9 +3,9 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
         BLOCK "StringFileInfo"
         BEGIN
-                BLOCK "041104B0"
+                BLOCK "000004b0"
                 BEGIN
-                        VALUE "FileDescription", "LibW3 Fetch"
+                        VALUE "ProductName", "LibW3 Tool\0"
                 END
         END
 END

diff --git a/Library/Makefile b/Library/Makefile
index ad1edac61ac03c3fedfa91167908b40175235509..f6be7408cfadcaa3e1d39c5b118af1b2833a43f6 100644 (file)
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -1,13 +1,15 @@
 # $Id$
 .PHONY: clean install
 
+OBJS = ./Core.o ./Util.o ./DNS.o ./HTTP.o
+
 ifeq ($(WINDOWS),YES)
-./w3.dll: ./Core.o ./Util.o ./DNS.o ./HTTP.o
+./w3.dll: $(OBJS)
        $(CC) $(LDFLAGS) -shared -Wl,--out-implib,./w3.lib -o $@ $^ $(LIBS)
 else
-./libw3.so: ./Core.o ./Util.o ./DNS.o ./HTTP.o
+./libw3.so: $(OBJS)
        $(CC) $(LDFLAGS) -shared -o $@ $^ $(LIBS)
-./libw3.a: ./Core.o ./Util.o ./DNS.o ./HTTP.o
+./libw3.a: $(OBJS)
        ar rcs $@ $^
 endif
 

diff --git a/Makefile b/Makefile
index 29233ab5fe0606c159e593424fce0c9406a0024a..f812e14a8c87dd54070ddcfd05f6e7f23964f12e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ all: ./w3.pc ./Library/W3Version.h $(ALL)
        $(MAKE) -C ./Library CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" WINDOWS=YES
 
 ./Example/fetch.exe: ./Library/w3.dll
-       $(MAKE) -C ./Example CC=$(CC) fetch RESFILE=./fetch.res WINDRES=$(WINDRES)
+       $(MAKE) -C ./Example CC=$(CC) fetch RESFILE=./libw3.res WINDRES=$(WINDRES)
 
 ./Library/W3Version.h:
        m4 -DSUFFIX=\"W\" ./W3Version.h.p > $@