# HG changeset patch # User Olaf Wintermann # Date 1564822975 -7200 # Node ID 6bf4c948d0baaa388c2a228c210ffc619d236aa6 # Parent 9d60baefa4ed3e9a51e3795e1b9074bcbae6123b make targets without name and prefix possible diff -r 9d60baefa4ed -r 6bf4c948d0ba test/config.mk --- a/test/config.mk Sat Aug 03 10:22:14 2019 +0200 +++ b/test/config.mk Sat Aug 03 11:02:55 2019 +0200 @@ -10,6 +10,8 @@ DAV_CFLAGS += -I/usr/include/libxml2 -DTEST DAV_LDFLAGS += -lcurl -lxml2 +CFLAGS += -DDEPTEST + # Dependency: libxml2 xml = libxml2 diff -r 9d60baefa4ed -r 6bf4c948d0ba test/configure --- a/test/configure Sat Aug 03 10:22:14 2019 +0200 +++ b/test/configure Sat Aug 03 11:02:55 2019 +0200 @@ -391,6 +391,20 @@ echo no return 1 } +dependency_deptest() +{ + printf "checking for deptest... " + # dependency deptest + while true + do + CFLAGS+="-DDEPTEST" + echo yes + return 0 + done + + echo no + return 1 +} dependency_libxml2() { printf "checking for libxml2... " @@ -611,6 +625,29 @@ echo "DAV_LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk fi +# Target +CFLAGS= +LDFLAGS= +CXXFLAGS= + +dependency_deptest +if [ $? -ne 0 ]; then + DEPENDENCIES_FAILED+="deptest " + ERROR=1 +fi + + +echo >> $TEMP_DIR/config.mk +if [[ ! -z ${CFLAGS} ]]; then + echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk +fi +if [[ ! -z ${CXXFLAGS} ]]; then + echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk +fi +if [[ ! -z ${LDFLAGS} ]]; then + echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk +fi + if [ $ERROR -ne 0 ]; then echo echo "Error: Unresolved dependencies" diff -r 9d60baefa4ed -r 6bf4c948d0ba test/make/project.xml --- a/test/make/project.xml Sat Aug 03 10:22:14 2019 +0200 +++ b/test/make/project.xml Sat Aug 03 11:02:55 2019 +0200 @@ -34,6 +34,10 @@ which qmake-qt4 + + -DDEPTEST + + MVAR = 123 MVAR += 123 @@ -69,5 +73,9 @@ curl,libxml2,test + + + deptest +