# HG changeset patch # User František Kučera # Date 1473544855 -7200 # Node ID f08e42c1efc0e785dee4403e740f560d8522f7c5 # Parent 6e5c4e267ddb1054d9998f014687ed9a8c599bc2 c++ Makefiles + java: .hgignore diff -r 6e5c4e267ddb -r f08e42c1efc0 .hgignore --- a/.hgignore Sun Sep 11 00:00:21 2016 +0200 +++ b/.hgignore Sun Sep 11 00:00:55 2016 +0200 @@ -6,3 +6,9 @@ c++/parameter-lister/dist/ c++/parameter-lister/build/ c++/parameter-lister/nbproject/private/ + +syntax: regexp + +^java/[^/]+/dist/ +^java/[^/]+/build/ +^java/[^/]+/nbproject/private/ diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/.dep.inc --- a/c++/parameter-lister/.dep.inc Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/.dep.inc Sun Sep 11 00:00:55 2016 +0200 @@ -1,5 +1,5 @@ # This code depends on make tool being used -DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) +DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES} ${TESTOBJECTFILES})) ifneq (${DEPFILES},) include ${DEPFILES} endif diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Makefile-Debug.mk --- a/c++/parameter-lister/nbproject/Makefile-Debug.mk Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Makefile-Debug.mk Sun Sep 11 00:00:55 2016 +0200 @@ -21,7 +21,7 @@ AS=as # Macros -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_DLIB_EXT=so CND_CONF=Debug CND_DISTDIR=dist diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Makefile-Release.mk --- a/c++/parameter-lister/nbproject/Makefile-Release.mk Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Makefile-Release.mk Sun Sep 11 00:00:55 2016 +0200 @@ -21,7 +21,7 @@ AS=as # Macros -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_DLIB_EXT=so CND_CONF=Release CND_DISTDIR=dist diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Makefile-impl.mk --- a/c++/parameter-lister/nbproject/Makefile-impl.mk Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Makefile-impl.mk Sun Sep 11 00:00:55 2016 +0200 @@ -76,7 +76,7 @@ .depcheck-impl: @echo "# This code depends on make tool being used" >.dep.inc @if [ -n "${MAKE_VERSION}" ]; then \ - echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \ + echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ echo "include \$${DEPFILES}" >>.dep.inc; \ echo "endif" >>.dep.inc; \ diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Makefile-variables.mk --- a/c++/parameter-lister/nbproject/Makefile-variables.mk Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Makefile-variables.mk Sun Sep 11 00:00:55 2016 +0200 @@ -7,21 +7,21 @@ CND_BUILDDIR=build CND_DISTDIR=dist # Debug configuration -CND_PLATFORM_Debug=GNU-Linux-x86 -CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux-x86 +CND_PLATFORM_Debug=GNU-Linux +CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux CND_ARTIFACT_NAME_Debug=parameter-lister -CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux-x86/parameter-lister -CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux-x86/package +CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux/parameter-lister +CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux/package CND_PACKAGE_NAME_Debug=parameter-lister.tar -CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/parameter-lister.tar +CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/parameter-lister.tar # Release configuration -CND_PLATFORM_Release=GNU-Linux-x86 -CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux-x86 +CND_PLATFORM_Release=GNU-Linux +CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux CND_ARTIFACT_NAME_Release=parameter-lister -CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/parameter-lister -CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux-x86/package +CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/parameter-lister +CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package CND_PACKAGE_NAME_Release=parameter-lister.tar -CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/parameter-lister.tar +CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/parameter-lister.tar # # include compiler specific variables # diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Package-Debug.bash --- a/c++/parameter-lister/nbproject/Package-Debug.bash Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Package-Debug.bash Sun Sep 11 00:00:55 2016 +0200 @@ -6,7 +6,7 @@ # Macros TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_CONF=Debug CND_DISTDIR=dist CND_BUILDDIR=build diff -r 6e5c4e267ddb -r f08e42c1efc0 c++/parameter-lister/nbproject/Package-Release.bash --- a/c++/parameter-lister/nbproject/Package-Release.bash Sun Sep 11 00:00:21 2016 +0200 +++ b/c++/parameter-lister/nbproject/Package-Release.bash Sun Sep 11 00:00:55 2016 +0200 @@ -6,7 +6,7 @@ # Macros TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 +CND_PLATFORM=GNU-Linux CND_CONF=Release CND_DISTDIR=dist CND_BUILDDIR=build