made debug flag settable from outside; add allways debug stuff when DB != NDEBUG

This commit is contained in:
Gunter Knauf 2007-06-22 21:10:17 +00:00
parent 03b03f7b60
commit 2aed8946b0
2 changed files with 10 additions and 9 deletions

View File

@ -25,7 +25,7 @@ endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-0.14 LIBSSH2_PATH = ../../libssh2-0.15
endif endif
ifndef INSTDIR ifndef INSTDIR
@ -47,10 +47,10 @@ ifndef LIBARCH
LIBARCH = LIBC LIBARCH = LIBC
endif endif
# must be equal to DEBUG or NDEBUG # must be equal to NDEBUG or DEBUG, CURLDEBUG
ifndef DB
DB = NDEBUG DB = NDEBUG
# DB = DEBUG endif
# DB = CURLDEBUG
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
OPT = -O2 OPT = -O2
@ -274,7 +274,7 @@ ifdef SCREEN
else else
@echo $(DL)screenname "DEFAULT"$(DL) >> $@ @echo $(DL)screenname "DEFAULT"$(DL) >> $@
endif endif
ifeq ($(DB),DEBUG) ifneq ($(DB),NDEBUG)
@echo $(DL)debug$(DL) >> $@ @echo $(DL)debug$(DL) >> $@
endif endif
@echo $(DL)threadname "$(TARGET)"$(DL) >> $@ @echo $(DL)threadname "$(TARGET)"$(DL) >> $@

View File

@ -25,7 +25,7 @@ endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-0.14 LIBSSH2_PATH = ../../libssh2-0.15
endif endif
ifndef INSTDIR ifndef INSTDIR
@ -48,9 +48,10 @@ ifndef LIBARCH
LIBARCH = LIBC LIBARCH = LIBC
endif endif
# must be equal to DEBUG or NDEBUG # must be equal to NDEBUG or DEBUG, CURLDEBUG
ifndef DB
DB = NDEBUG DB = NDEBUG
# DB = DEBUG endif
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
OPT = -O2 OPT = -O2
@ -252,7 +253,7 @@ ifdef SCREEN
else else
@echo $(DL)screenname "DEFAULT"$(DL) >> $@ @echo $(DL)screenname "DEFAULT"$(DL) >> $@
endif endif
ifeq ($(DB),DEBUG) ifneq ($(DB),NDEBUG)
@echo $(DL)debug$(DL) >> $@ @echo $(DL)debug$(DL) >> $@
endif endif
@echo $(DL)threadname "$(TARGET)"$(DL) >> $@ @echo $(DL)threadname "$(TARGET)"$(DL) >> $@