debug

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

diff --git a/Example/Makefile b/Example/Makefile
index 834103f8577244240645be9de5d8501dd536ebb2..14a42269fb5c84d4f5c66d86bd5902e1e2f5800d 100644 (file)
--- a/Example/Makefile
+++ b/Example/Makefile
@@ -5,7 +5,7 @@
        $(CC) -o $@ -I ../Library -L ../Library $< -lw3
 
 clean:
-       rm -f fetch *.o *.so *.core
+       rm -f fetch *.o *.so *.core *~
 
 install: ./fetch
        mkdir -p $(PREFIX)/bin

diff --git a/Library/Makefile b/Library/Makefile
index 307b964f81dbf134731cedb8597db0c67a7a4c9f..08147f61b549928ad02c6f9ee15c5c2b724b0167 100644 (file)
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -8,7 +8,7 @@
        $(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-       rm -f *.o *.so *.core
+       rm -f *.o *.so *.core *~
 
 install: ./libw3.so
        mkdir -p $(PREFIX)/lib

diff --git a/Library/Util.c b/Library/Util.c
index a1ebd9ca68f2c1669e5755d6a65313f5f428831b..906e2792cc131da5b1b21770cd91e892780bb0eb 100644 (file)
--- a/Library/Util.c
+++ b/Library/Util.c
@@ -15,3 +15,11 @@ void __W3_Debug(const char* title, const char* message){
        fprintf(stderr, "%s%s %s\n", title, periods, message);
 #endif
 }
+
+char* __W3_Concat(const char* str1, const char* str2){
+       char* str = malloc(strlen(str1) + strlen(str2) + 1);
+       strcpy(str, str1);
+       strcpy(str + strlen(str1), str2);
+       str[strlen(str1) + strlen(str2)] = 0;
+       return str;
+}

diff --git a/Library/W3Util.h b/Library/W3Util.h
index 94bef349e39683772ef10f901adb15f4f3c9aefd..9eefd88b7327f03c0f6514792da74079450cea87 100644 (file)
--- a/Library/W3Util.h
+++ b/Library/W3Util.h
@@ -3,5 +3,6 @@
 #define __W3UTIL_H__
 
 void __W3_Debug(const char* title, const char* message);
+char* __W3_Concat(const char* str1, const char* str2);
 
 #endif

diff --git a/Makefile b/Makefile
index 7a76b1f855cb52a5156e78d89f60970fb68e92dd..f060b86a7deded17e76ab92a8519a10381dc6434 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 include config.mk
 
 CC := cc
-CFLAGS := -g -std=c99 -fPIC -D_BSD_SOURCE
+CFLAGS := -g -std=c99 -fPIC -D_BSD_SOURCE $(DEBUG)
 LDFLAGS :=
 LIBS :=
 PREFIX := /usr/local
@@ -12,10 +12,6 @@ CFLAGS += -DSSL_SUPPORT
 LIBS += -lssl -lcrypto
 endif
 
-ifdef DEBUG
-CFLAGS += -D__DEBUG__
-endif
-
 .PHONY: all clean ./Library/libw3.so ./Example/fetch
 
 all: ./w3.pc ./Library/libw3.so ./Example/fetch
@@ -39,7 +35,7 @@ all: ./w3.pc ./Library/libw3.so ./Example/fetch
        echo "Libs: -I\$${libdir} -lw3" >> $@
 
 clean:
-       rm ./w3.pc
+       -rm ./w3.pc
        $(MAKE) -C ./Library clean
        $(MAKE) -C ./Example clean