From 3666fc6a3e0d4c0852fe8395f07bd5bf5e504602 Mon Sep 17 00:00:00 2001
From: nishi <nishi@d27a3e52-49c5-7645-884c-6793ebffc270>
Date: Mon, 22 Jan 2024 02:37:21 +0000
Subject: [PATCH] changed the structure

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@45 d27a3e52-49c5-7645-884c-6793ebffc270
---
 Example/Makefile               | 2 +-
 Example/{fetch.rc => libw3.rc} | 4 ++--
 Library/Makefile               | 8 +++++---
 Makefile                       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename Example/{fetch.rc => libw3.rc} (62%)

diff --git a/Example/Makefile b/Example/Makefile
index 4742441..1087120 100644
--- 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 f3653e7..1f0fe57 100644
--- 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 ad1edac..f6be740 100644
--- 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 29233ab..f812e14 100644
--- 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 > $@
-- 
2.43.0