summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2007-06-22 21:10:17 +0000
committerGunter Knauf <gk@gknw.de>2007-06-22 21:10:17 +0000
commit2aed8946b07ff7c738bbc7d79e1373ef5ed281c0 (patch)
tree11fa4c7ebdc3347b14105d89f89ce0e0229ceed1
parent03b03f7b60c984422fc9022d734a2a9657c1d0a0 (diff)
downloadcurl-2aed8946b07ff7c738bbc7d79e1373ef5ed281c0.tar.gz
made debug flag settable from outside; add allways debug stuff when DB != NDEBUG
-rw-r--r--lib/Makefile.netware10
-rw-r--r--src/Makefile.netware9
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 51fb08e07..f089d11b8 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -25,7 +25,7 @@ endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.14
+LIBSSH2_PATH = ../../libssh2-0.15
endif
ifndef INSTDIR
@@ -47,10 +47,10 @@ ifndef LIBARCH
LIBARCH = LIBC
endif
-# must be equal to DEBUG or NDEBUG
+# must be equal to NDEBUG or DEBUG, CURLDEBUG
+ifndef DB
DB = NDEBUG
-# DB = DEBUG
-# DB = CURLDEBUG
+endif
# Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG)
OPT = -O2
@@ -274,7 +274,7 @@ ifdef SCREEN
else
@echo $(DL)screenname "DEFAULT"$(DL) >> $@
endif
-ifeq ($(DB),DEBUG)
+ifneq ($(DB),NDEBUG)
@echo $(DL)debug$(DL) >> $@
endif
@echo $(DL)threadname "$(TARGET)"$(DL) >> $@
diff --git a/src/Makefile.netware b/src/Makefile.netware
index f39141397..d625013ab 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -25,7 +25,7 @@ endif
# Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.14
+LIBSSH2_PATH = ../../libssh2-0.15
endif
ifndef INSTDIR
@@ -48,9 +48,10 @@ ifndef LIBARCH
LIBARCH = LIBC
endif
-# must be equal to DEBUG or NDEBUG
+# must be equal to NDEBUG or DEBUG, CURLDEBUG
+ifndef DB
DB = NDEBUG
-# DB = DEBUG
+endif
# Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG)
OPT = -O2
@@ -252,7 +253,7 @@ ifdef SCREEN
else
@echo $(DL)screenname "DEFAULT"$(DL) >> $@
endif
-ifeq ($(DB),DEBUG)
+ifneq ($(DB),NDEBUG)
@echo $(DL)debug$(DL) >> $@
endif
@echo $(DL)threadname "$(TARGET)"$(DL) >> $@