From 10b5fb0edd3d22ee93836ddcca3d243feb25fbc9 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Fri, 2 Nov 2018 22:17:32 +0100 Subject: [PATCH] remove makefile building tool --- .gitlab-ci.yml | 53 +---- aaccess2/makefile | 3 - aaccess2/makefile.conf | 2 - aarbology2/makefile | 3 - aarbology2/makefile.conf | 2 - acast2/makefile | 3 - acast2/makefile.conf | 2 - acompaction2/makefile | 3 - acompaction2/makefile.conf | 2 - acompare2/makefile | 3 - acompare2/makefile.conf | 2 - aconversions2/makefile | 3 - aconversions2/makefile.conf | 2 - aconvert2/makefile | 3 - aconvert2/makefile.conf | 2 - aderivation2/makefile | 3 - aderivation2/makefile.conf | 2 - adeterminize2/makefile | 3 - adeterminize2/makefile.conf | 2 - aecho2/makefile | 3 - aecho2/makefile.conf | 2 - aepsilon2/makefile | 3 - aepsilon2/makefile.conf | 2 - agenerate2/makefile | 3 - agenerate2/makefile.conf | 2 - aintegral2/makefile | 3 - aintegral2/makefile.conf | 2 - aintrospection2/makefile | 3 - aintrospection2/makefile.conf | 2 - alangop2/makefile | 3 - alangop2/makefile.conf | 2 - alib2abstraction/makefile | 3 - alib2abstraction/makefile.conf | 5 - alib2algo/makefile | 3 - alib2algo/makefile.conf | 5 - alib2algo_experimental/makefile | 3 - alib2algo_experimental/makefile.conf | 5 - alib2aux/makefile | 3 - alib2aux/makefile.conf | 5 - alib2cli/makefile | 3 - alib2cli/makefile.conf | 5 - alib2common/makefile | 3 - alib2common/makefile.conf | 5 - alib2data/makefile | 3 - alib2data/makefile.conf | 5 - alib2data_experimental/makefile | 3 - alib2data_experimental/makefile.conf | 5 - alib2dummy/makefile | 3 - alib2dummy/makefile.conf | 5 - alib2elgo/makefile | 3 - alib2elgo/makefile.conf | 5 - alib2graph_algo/makefile | 3 - alib2graph_algo/makefile.conf | 5 - alib2graph_data/makefile | 3 - alib2graph_data/makefile.conf | 6 - alib2measure/makefile | 3 - alib2measure/makefile.conf | 5 - alib2raw/makefile | 3 - alib2raw/makefile.conf | 5 - alib2raw_cli_integration/makefile | 3 - alib2raw_cli_integration/makefile.conf | 5 - alib2std/makefile | 3 - alib2std/makefile.conf | 5 - alib2str/makefile | 3 - alib2str/makefile.conf | 5 - alib2str_cli_integration/makefile | 3 - alib2str_cli_integration/makefile.conf | 5 - alib2xml/makefile | 3 - alib2xml/makefile.conf | 5 - all-debug.sh | 4 - all-release.sh | 4 - aminimize2/makefile | 3 - aminimize2/makefile.conf | 2 - anormalize2/makefile | 3 - anormalize2/makefile.conf | 2 - aql2/makefile | 3 - aql2/makefile.conf | 2 - aquery2/makefile | 3 - aquery2/makefile.conf | 2 - arand2/makefile | 3 - arand2/makefile.conf | 2 - araw2/makefile | 3 - araw2/makefile.conf | 2 - arename2/makefile | 3 - arename2/makefile.conf | 2 - areverse2/makefile | 3 - areverse2/makefile.conf | 2 - arun2/makefile | 3 - arun2/makefile.conf | 2 - astat2/makefile | 3 - astat2/makefile.conf | 2 - astringology2/makefile | 3 - astringology2/makefile.conf | 2 - atrim2/makefile | 3 - atrim2/makefile.conf | 2 - build-debug.sh | 3 - build-release.sh | 3 - makefile | 208 ------------------- makefile-binary | 165 --------------- makefile-library | 268 ------------------------- makefile-rec | 46 ----- tniceprint/makefile | 3 - tniceprint/makefile.conf | 2 - 103 files changed, 2 insertions(+), 1045 deletions(-) delete mode 100644 aaccess2/makefile delete mode 100644 aarbology2/makefile delete mode 100644 acast2/makefile delete mode 100644 acompaction2/makefile delete mode 100644 acompare2/makefile delete mode 100644 aconversions2/makefile delete mode 100644 aconvert2/makefile delete mode 100644 aderivation2/makefile delete mode 100644 adeterminize2/makefile delete mode 100644 aecho2/makefile delete mode 100644 aepsilon2/makefile delete mode 100644 agenerate2/makefile delete mode 100644 aintegral2/makefile delete mode 100644 aintrospection2/makefile delete mode 100644 alangop2/makefile delete mode 100644 alib2abstraction/makefile delete mode 100644 alib2algo/makefile delete mode 100644 alib2algo_experimental/makefile delete mode 100644 alib2aux/makefile delete mode 100644 alib2cli/makefile delete mode 100644 alib2common/makefile delete mode 100644 alib2data/makefile delete mode 100644 alib2data_experimental/makefile delete mode 100644 alib2dummy/makefile delete mode 100644 alib2elgo/makefile delete mode 100644 alib2graph_algo/makefile delete mode 100644 alib2graph_data/makefile delete mode 100644 alib2measure/makefile delete mode 100644 alib2raw/makefile delete mode 100644 alib2raw_cli_integration/makefile delete mode 100644 alib2std/makefile delete mode 100644 alib2str/makefile delete mode 100644 alib2str_cli_integration/makefile delete mode 100644 alib2xml/makefile delete mode 100755 all-debug.sh delete mode 100755 all-release.sh delete mode 100644 aminimize2/makefile delete mode 100644 anormalize2/makefile delete mode 100644 aql2/makefile delete mode 100644 aquery2/makefile delete mode 100644 arand2/makefile delete mode 100644 araw2/makefile delete mode 100644 arename2/makefile delete mode 100644 areverse2/makefile delete mode 100644 arun2/makefile delete mode 100644 astat2/makefile delete mode 100644 astringology2/makefile delete mode 100644 atrim2/makefile delete mode 100755 build-debug.sh delete mode 100755 build-release.sh delete mode 100644 makefile delete mode 100644 makefile-binary delete mode 100644 makefile-library delete mode 100644 makefile-rec delete mode 100644 tniceprint/makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d431d1d1e..6158311b52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,34 +19,10 @@ before_script: *-clang) ln -s /usr/lib/llvm5/lib/LLVMgold.so /usr/lib/LLVMgold.so;; *) ;; esac - - echo USE_RAMDISK=0 >> build.conf - - case "$CI_BUILD_NAME" in - *-clang) echo USE_LTO=1 >> build.conf;; - *) echo USE_LTO=0 >> build.conf;; - esac - - echo USE_MARCH= >> build.conf #========== Stage build ========== -.build: &build - script: - - make release - - make install-release - artifacts: - paths: - - bin-release - - "*/bin-release" - - "*/lib-release" - expire_in: 1 day - stage: build - -build-gcc: - <<: *build - -build-clang: - <<: *build - .build-cmake: &build-cmake variables: EXTRA_PKGS: cmake python3 py3-click @@ -83,43 +59,18 @@ build-doc: variables: EXTRA_PKGS: doxygen graphviz script: - - make doc + - doxygen allow_failure: true artifacts: name: docs paths: - - alib2std/doc/ - - alib2data/doc/ - - alib2common/doc/ - - alib2str/doc/ - - alib2raw/doc/ - - alib2algo/doc/ - - alib2elgo/doc/ - - alib2measurepp/doc/ + - doc/ expire_in: 1 week stage: build #========== Stage test ========== -.test: &test - variables: - # coreutils are needed because of timeout command used in tests. - EXTRA_PKGS: bc coreutils python3 - script: - - make test-release - stage: test - -test-gcc: - <<: *test - dependencies: - - build-gcc - -test-clang: - <<: *test - dependencies: - - build-clang - .test-cmake: &test-cmake variables: # coreutils are needed because of timeout command used in tests. diff --git a/aaccess2/makefile b/aaccess2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aaccess2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aaccess2/makefile.conf b/aaccess2/makefile.conf index 0d146f9045..ecd8ef76d4 100644 --- a/aaccess2/makefile.conf +++ b/aaccess2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aaccess2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aarbology2/makefile b/aarbology2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aarbology2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf index f0bc44c52b..ecd8ef76d4 100644 --- a/aarbology2/makefile.conf +++ b/aarbology2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aarbology2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/acast2/makefile b/acast2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/acast2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/acast2/makefile.conf b/acast2/makefile.conf index 16c31c6d46..ecd8ef76d4 100644 --- a/acast2/makefile.conf +++ b/acast2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=acast2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/acompaction2/makefile b/acompaction2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/acompaction2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/acompaction2/makefile.conf b/acompaction2/makefile.conf index 98f1cd1ae6..ecd8ef76d4 100644 --- a/acompaction2/makefile.conf +++ b/acompaction2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=acompaction2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/acompare2/makefile b/acompare2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/acompare2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/acompare2/makefile.conf b/acompare2/makefile.conf index 303ddb7208..9e07c416d0 100644 --- a/acompare2/makefile.conf +++ b/acompare2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=acompare2 LINK_LIBRARIES=alib2cli alib2aux alib2str alib2graph_data alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aconversions2/makefile b/aconversions2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aconversions2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aconversions2/makefile.conf b/aconversions2/makefile.conf index f18b6f145d..ecd8ef76d4 100644 --- a/aconversions2/makefile.conf +++ b/aconversions2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aconversions2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aconvert2/makefile b/aconvert2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aconvert2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aconvert2/makefile.conf b/aconvert2/makefile.conf index 89f4a78065..9e07c416d0 100644 --- a/aconvert2/makefile.conf +++ b/aconvert2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aconvert2 LINK_LIBRARIES=alib2cli alib2aux alib2str alib2graph_data alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aderivation2/makefile b/aderivation2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aderivation2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aderivation2/makefile.conf b/aderivation2/makefile.conf index dc8b8a1a42..ecd8ef76d4 100644 --- a/aderivation2/makefile.conf +++ b/aderivation2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aderivation2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/adeterminize2/makefile b/adeterminize2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/adeterminize2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/adeterminize2/makefile.conf b/adeterminize2/makefile.conf index 9d212d7aa3..ecd8ef76d4 100644 --- a/adeterminize2/makefile.conf +++ b/adeterminize2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=adeterminize2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aecho2/makefile b/aecho2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aecho2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aecho2/makefile.conf b/aecho2/makefile.conf index db407134c9..f191b38d1b 100644 --- a/aecho2/makefile.conf +++ b/aecho2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aecho2 LINK_LIBRARIES=alib2cli alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aepsilon2/makefile b/aepsilon2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aepsilon2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aepsilon2/makefile.conf b/aepsilon2/makefile.conf index 0815686917..ecd8ef76d4 100644 --- a/aepsilon2/makefile.conf +++ b/aepsilon2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aepsilon2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/agenerate2/makefile b/agenerate2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/agenerate2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/agenerate2/makefile.conf b/agenerate2/makefile.conf index 40d814d62a..ecd8ef76d4 100644 --- a/agenerate2/makefile.conf +++ b/agenerate2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=agenerate2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aintegral2/makefile b/aintegral2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aintegral2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aintegral2/makefile.conf b/aintegral2/makefile.conf index 8b3e400af8..ecd8ef76d4 100644 --- a/aintegral2/makefile.conf +++ b/aintegral2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aintegral2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aintrospection2/makefile b/aintrospection2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aintrospection2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aintrospection2/makefile.conf b/aintrospection2/makefile.conf index a0789aab19..234871704f 100644 --- a/aintrospection2/makefile.conf +++ b/aintrospection2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aintrospection2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo_experimental alib2algo alib2raw alib2str alib2data_experimental alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/alangop2/makefile b/alangop2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/alangop2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/alangop2/makefile.conf b/alangop2/makefile.conf index d7825d8f86..ecd8ef76d4 100644 --- a/alangop2/makefile.conf +++ b/alangop2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=alangop2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/alib2abstraction/makefile b/alib2abstraction/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2abstraction/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2abstraction/makefile.conf b/alib2abstraction/makefile.conf index 20108e6424..ea2610b2e2 100644 --- a/alib2abstraction/makefile.conf +++ b/alib2abstraction/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2abstraction -TESTBIN:=alib2test - LINK_LIBRARIES=alib2std SYSTEM_LIBRARIES= -SYSTEM_INCLUDE_PATHS= TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2algo/makefile b/alib2algo/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2algo/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2algo/makefile.conf b/alib2algo/makefile.conf index 9b98b44143..58f8cf13df 100644 --- a/alib2algo/makefile.conf +++ b/alib2algo/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2algo -TESTBIN:=alib2test - LINK_LIBRARIES=alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES=alib2str TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2algo_experimental/makefile b/alib2algo_experimental/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2algo_experimental/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2algo_experimental/makefile.conf b/alib2algo_experimental/makefile.conf index 0bff7174ac..c41183047e 100644 --- a/alib2algo_experimental/makefile.conf +++ b/alib2algo_experimental/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2algo_experimental -TESTBIN:=alib2test - LINK_LIBRARIES=alib2algo alib2data_experimental alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES=alib2str TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2aux/makefile b/alib2aux/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2aux/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2aux/makefile.conf b/alib2aux/makefile.conf index e5274b859e..898278fdb6 100644 --- a/alib2aux/makefile.conf +++ b/alib2aux/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2aux -TESTBIN:=alib2test - LINK_LIBRARIES=alib2str alib2graph_data alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2cli/makefile b/alib2cli/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2cli/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2cli/makefile.conf b/alib2cli/makefile.conf index a433dc4b45..83fd22cf4c 100644 --- a/alib2cli/makefile.conf +++ b/alib2cli/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2cli -TESTBIN:=alib2test - LINK_LIBRARIES=alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 stdc++fs -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2common/makefile b/alib2common/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2common/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2common/makefile.conf b/alib2common/makefile.conf index 9d632f126b..91392cc68f 100644 --- a/alib2common/makefile.conf +++ b/alib2common/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2common -TESTBIN:=alib2test - LINK_LIBRARIES=alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES= -SYSTEM_INCLUDE_PATHS= TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2data/makefile b/alib2data/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2data/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2data/makefile.conf b/alib2data/makefile.conf index 367126234c..2bd89df75b 100644 --- a/alib2data/makefile.conf +++ b/alib2data/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2data -TESTBIN:=alib2test - LINK_LIBRARIES=alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2data_experimental/makefile b/alib2data_experimental/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2data_experimental/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2data_experimental/makefile.conf b/alib2data_experimental/makefile.conf index f064ddaf7d..915aeab509 100644 --- a/alib2data_experimental/makefile.conf +++ b/alib2data_experimental/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2data_experimental -TESTBIN:=alib2test - LINK_LIBRARIES=alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2dummy/makefile b/alib2dummy/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2dummy/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2dummy/makefile.conf b/alib2dummy/makefile.conf index b8647605d2..2bd89df75b 100644 --- a/alib2dummy/makefile.conf +++ b/alib2dummy/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2dummy -TESTBIN:=alib2test - LINK_LIBRARIES=alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2elgo/makefile b/alib2elgo/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2elgo/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2elgo/makefile.conf b/alib2elgo/makefile.conf index b03f3f3077..73783317e9 100644 --- a/alib2elgo/makefile.conf +++ b/alib2elgo/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2elgo -TESTBIN:=alib2test - LINK_LIBRARIES=alib2algo alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES=alib2str TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2graph_algo/makefile b/alib2graph_algo/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2graph_algo/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2graph_algo/makefile.conf b/alib2graph_algo/makefile.conf index 76b4603c8c..e577fdac49 100644 --- a/alib2graph_algo/makefile.conf +++ b/alib2graph_algo/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2graph_algo -TESTBIN:=alib2test - LINK_LIBRARIES=alib2graph_data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2graph_data/makefile b/alib2graph_data/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2graph_data/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2graph_data/makefile.conf b/alib2graph_data/makefile.conf index 24f56c5549..2bd89df75b 100644 --- a/alib2graph_data/makefile.conf +++ b/alib2graph_data/makefile.conf @@ -1,10 +1,4 @@ -LIBRARY:=alib2graph_data -TESTBIN:=alib2test - LINK_LIBRARIES=alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= - diff --git a/alib2measure/makefile b/alib2measure/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2measure/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2measure/makefile.conf b/alib2measure/makefile.conf index 3eb6995bbf..81fee2807a 100644 --- a/alib2measure/makefile.conf +++ b/alib2measure/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2measure -TESTBIN:=alib2test - LINK_LIBRARIES= SYSTEM_LIBRARIES= -SYSTEM_INCLUDE_PATHS= TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2raw/makefile b/alib2raw/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2raw/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2raw/makefile.conf b/alib2raw/makefile.conf index f388eb0565..915aeab509 100644 --- a/alib2raw/makefile.conf +++ b/alib2raw/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2raw -TESTBIN:=alib2test - LINK_LIBRARIES=alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2raw_cli_integration/makefile b/alib2raw_cli_integration/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2raw_cli_integration/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2raw_cli_integration/makefile.conf b/alib2raw_cli_integration/makefile.conf index 8a0672aae3..4dd6cd66d4 100644 --- a/alib2raw_cli_integration/makefile.conf +++ b/alib2raw_cli_integration/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2raw_cli_integration -TESTBIN:=alib2test - LINK_LIBRARIES=alib2raw alib2data alib2cli alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2std/makefile b/alib2std/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2std/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2std/makefile.conf b/alib2std/makefile.conf index eece1a74ef..81fee2807a 100644 --- a/alib2std/makefile.conf +++ b/alib2std/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2std -TESTBIN:=alib2test - LINK_LIBRARIES= SYSTEM_LIBRARIES= -SYSTEM_INCLUDE_PATHS= TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2str/makefile b/alib2str/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2str/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2str/makefile.conf b/alib2str/makefile.conf index 36a4e4ebb2..915aeab509 100644 --- a/alib2str/makefile.conf +++ b/alib2str/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2str -TESTBIN:=alib2test - LINK_LIBRARIES=alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2str_cli_integration/makefile b/alib2str_cli_integration/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2str_cli_integration/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2str_cli_integration/makefile.conf b/alib2str_cli_integration/makefile.conf index 1c01f70032..aff2be9a27 100644 --- a/alib2str_cli_integration/makefile.conf +++ b/alib2str_cli_integration/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2str_cli_integration -TESTBIN:=alib2test - LINK_LIBRARIES=alib2str alib2data alib2cli alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/alib2xml/makefile b/alib2xml/makefile deleted file mode 100644 index 0b88694038..0000000000 --- a/alib2xml/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-library diff --git a/alib2xml/makefile.conf b/alib2xml/makefile.conf index be93c7ac77..e35133ecc1 100644 --- a/alib2xml/makefile.conf +++ b/alib2xml/makefile.conf @@ -1,9 +1,4 @@ -LIBRARY:=alib2xml -TESTBIN:=alib2test - LINK_LIBRARIES=alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 TEST_LINK_LIBRARIES= TEST_SYSTEM_LIBRARIES= -TEST_SYSTEM_INCLUDE_PATHS= diff --git a/all-debug.sh b/all-debug.sh deleted file mode 100755 index 84ace32b73..0000000000 --- a/all-debug.sh +++ /dev/null @@ -1,4 +0,0 @@ -THREADS=${1:-5} -CXX=clang++ make debug -j${THREADS} || exit 1 -CXX=clang++ make install-debug -j${THREADS} || exit 1 -CXX=clang++ make test-debug -j${THREADS} || exit 1 diff --git a/all-release.sh b/all-release.sh deleted file mode 100755 index 7e46a76d0c..0000000000 --- a/all-release.sh +++ /dev/null @@ -1,4 +0,0 @@ -THREADS=${1:-5} -CXX=g++-7 make release -j${THREADS} || exit 1 -CXX=g++-7 make install-release -j${THREADS} || exit 1 -CXX=g++-7 make test-release -j${THREADS} || exit 1 diff --git a/aminimize2/makefile b/aminimize2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aminimize2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aminimize2/makefile.conf b/aminimize2/makefile.conf index 59a66b7949..ecd8ef76d4 100644 --- a/aminimize2/makefile.conf +++ b/aminimize2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aminimize2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/anormalize2/makefile b/anormalize2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/anormalize2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/anormalize2/makefile.conf b/anormalize2/makefile.conf index 8dce905656..ecd8ef76d4 100644 --- a/anormalize2/makefile.conf +++ b/anormalize2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=anormalize2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aql2/makefile b/aql2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aql2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aql2/makefile.conf b/aql2/makefile.conf index 27e7dc7938..fb2d1c40d2 100644 --- a/aql2/makefile.conf +++ b/aql2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aql2 LINK_LIBRARIES=alib2elgo alib2graph_algo alib2algo alib2aux alib2raw_cli_integration alib2raw alib2str_cli_integration alib2str alib2graph_data alib2data alib2dummy alib2cli alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 readline -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/aquery2/makefile b/aquery2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/aquery2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/aquery2/makefile.conf b/aquery2/makefile.conf index b9ce9f1e6a..ecd8ef76d4 100644 --- a/aquery2/makefile.conf +++ b/aquery2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=aquery2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/arand2/makefile b/arand2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/arand2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/arand2/makefile.conf b/arand2/makefile.conf index 6079efaa25..ecd8ef76d4 100644 --- a/arand2/makefile.conf +++ b/arand2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=arand2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/araw2/makefile b/araw2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/araw2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/araw2/makefile.conf b/araw2/makefile.conf index 20acf6e73f..1a2ab573a6 100644 --- a/araw2/makefile.conf +++ b/araw2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=araw2 LINK_LIBRARIES=alib2cli alib2raw alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/arename2/makefile b/arename2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/arename2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/arename2/makefile.conf b/arename2/makefile.conf index 7b8b15d103..ecd8ef76d4 100644 --- a/arename2/makefile.conf +++ b/arename2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=arename2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/areverse2/makefile b/areverse2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/areverse2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/areverse2/makefile.conf b/areverse2/makefile.conf index 9f4a54b163..ecd8ef76d4 100644 --- a/areverse2/makefile.conf +++ b/areverse2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=areverse2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/arun2/makefile b/arun2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/arun2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/arun2/makefile.conf b/arun2/makefile.conf index af7e5f8666..ecd8ef76d4 100644 --- a/arun2/makefile.conf +++ b/arun2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=arun2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/astat2/makefile b/astat2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/astat2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/astat2/makefile.conf b/astat2/makefile.conf index f6dc105248..4c5c53a50a 100644 --- a/astat2/makefile.conf +++ b/astat2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=astat2 LINK_LIBRARIES=alib2cli alib2str alib2aux alib2graph_data alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/astringology2/makefile b/astringology2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/astringology2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/astringology2/makefile.conf b/astringology2/makefile.conf index d939d9a8b6..ecd8ef76d4 100644 --- a/astringology2/makefile.conf +++ b/astringology2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=astringology2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/atrim2/makefile b/atrim2/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/atrim2/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/atrim2/makefile.conf b/atrim2/makefile.conf index 7ea7d93606..ecd8ef76d4 100644 --- a/atrim2/makefile.conf +++ b/atrim2/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=atrim2 LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 diff --git a/build-debug.sh b/build-debug.sh deleted file mode 100755 index 7c6f18f2f4..0000000000 --- a/build-debug.sh +++ /dev/null @@ -1,3 +0,0 @@ -THREADS=${1:-5} -CXX=clang++ make build-code-debug -j${THREADS} || exit 1 -CXX=clang++ make install-debug -j${THREADS} || exit 1 diff --git a/build-release.sh b/build-release.sh deleted file mode 100755 index 286609aed0..0000000000 --- a/build-release.sh +++ /dev/null @@ -1,3 +0,0 @@ -THREADS=${1:-5} -CXX=g++-7 make build-code-release -j${THREADS} || exit 1 -CXX=g++-7 make install-release -j${THREADS} || exit 1 diff --git a/makefile b/makefile deleted file mode 100644 index 10b4f0add1..0000000000 --- a/makefile +++ /dev/null @@ -1,208 +0,0 @@ -SHELL = /bin/bash -APPPATH = /usr/bin -LIBPATH = /usr/lib -BINFOLDER = bin - -ifeq ("$(wildcard build.conf)","") -$(shell echo USE_RAMDISK=0 >> build.conf) -$(shell echo USE_LTO=0 >> build.conf) -$(shell echo USE_MARCH= >> build.conf) -endif - --include build.conf - -# can be queued from version 4.2 via MAKEFLAGS sice there is the number of jobs as well -MAKE_PID := $(shell echo $$PPID) -JOB_FLAG := $(filter -j%, $(subst -j ,-j,$(shell ps T | grep "^\s*$(MAKE_PID).*$(MAKE)"))) -JOBS := $(subst -j,,$(JOB_FLAG)) -ifndef JOBS -JOBS := 1 -endif - -SUBDIRS_LIBS = alib2std \ - alib2measure \ - alib2abstraction \ - alib2common \ - alib2xml \ - alib2cli \ - alib2dummy \ - alib2data \ - alib2graph_data \ - alib2data_experimental \ - alib2str \ - alib2str_cli_integration \ - alib2raw \ - alib2raw_cli_integration \ - alib2aux \ - alib2algo \ - alib2graph_algo \ - alib2algo_experimental \ - alib2elgo \ - -SUBDIRS_BINS = aecho2 \ - aarbology2 \ - acast2 \ - aconversions2 \ - aconvert2 \ - acompaction2 \ - aderivation2 \ - adeterminize2 \ - acompare2 \ - aepsilon2 \ - agenerate2 \ - aintegral2 \ - alangop2 \ - aminimize2 \ - anormalize2 \ - araw2 \ - arand2 \ - arename2 \ - areverse2 \ - arun2 \ - astat2 \ - aaccess2 \ - astringology2 \ - aquery2 \ - atrim2 \ - tniceprint \ - aintrospection2 \ - aql2 \ - -define NEW_LINE - - -endef - -export NEW_LINE - -ifneq (3.81, $(firstword $(sort $(MAKE_VERSION) 3.81))) -$(error version $(MAKE_VERSION) is not supported. You need at least 3.82 is needed for make to work) -endif - -TCLAP_EXISTS = $(shell $(CXX) -c -o /dev/null -xc++ - <<< $$'\#include <tclap/CmdLine.h>'; echo $$?) -ifneq (0, $(TCLAP_EXISTS)) -$(error You need tclap installed) -endif - -CPPUNIT_EXISTS = $(shell $(CXX) -o /dev/null -lcppunit -xc++ - <<< $$'\#include <cppunit/Test.h>\nint main() {\nreturn 0;\n}'; echo $$?) -ifneq (0, $(CPPUNIT_EXISTS)) -$(error You need cppunit installed) -endif - -READLINE_EXISTS = $(shell $(CXX) -o /dev/null -lcppunit -xc++ - <<< $$'\#include <stdio.h>\n\#include <readline/readline.h>\nint main() {\nreturn 0;\n}'; echo $$?) -ifneq (0, $(READLINE_EXISTS)) -$(error You need readline installed) -endif - - -LIBXML2_EXISTS = $(shell $(CXX) -o /dev/null -I/usr/include/libxml2/ -lxml2 -xc++ -std=c++11 - <<< $$'\#include <libxml/xmlreader.h>\nint main() {\nreturn 0;\n}'; echo $$?) -ifneq (0, $(LIBXML2_EXISTS)) -$(error You need libxml2 installed) -endif - - -SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile)) - -.PHONY: build-debug test-debug clean-debug \ - build-release test-release clean-release \ - debug release clean doc all - -all: - @echo "What to do master?" - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# standalone main targets - -test-unit-debug test-unit-release: - for dir in $(SUBDIRS_LIBS); do \ - $(MAKE) $@ -C $$dir || exit 1; \ - done - -build-test-debug build-test-release: - for dir in $(SUBDIRS_LIBS); do \ - $(MAKE) $@ -C $$dir || exit 1; \ - done - -build-libs-debug build-libs-release: - for dir in $(SUBDIRS_LIBS); do \ - $(MAKE) $(subst libs,code,$@) -C $$dir || exit 1; \ - done - -build-bins-debug build-bins-release: - for dir in $(SUBDIRS_BINS); do \ - $(MAKE) $(subst bins,code,$@) -C $$dir || exit 1; \ - done - -build-code-debug build-code-release: - $(MAKE) $(subst code,libs,$@); \ - $(MAKE) $(subst code,bins,$@); - -test-debug: - for test in $(wildcard tests.*.sh); do \ - ./$$test bin-debug $(JOBS); \ - done - -test-release: - for test in $(wildcard tests.*.sh); do \ - ./$$test bin-release $(JOBS); \ - done - -install-debug: - mkdir -p $(addsuffix -debug, $(BINFOLDER)); \ - rm -rf $(addsuffix -debug, $(BINFOLDER))/*; \ - cd $(addsuffix -debug, $(BINFOLDER)); \ - for dir in $(SUBDIRS_LIBS); do \ - cp -rs ../$$dir/lib-debug/* .; \ - done; \ - for dir in $(SUBDIRS_BINS); do \ - cp -rs ../$$dir/bin-debug/* .; \ - done; \ - cd ..; \ - cp translateAddresses $(addsuffix -debug, $(BINFOLDER)); \ - cp xmlFormat $(addsuffix -debug, $(BINFOLDER)) - -install-release: - mkdir -p $(addsuffix -release, $(BINFOLDER)); \ - rm -rf $(addsuffix -release, $(BINFOLDER))/*; \ - cd $(addsuffix -release, $(BINFOLDER)); \ - for dir in $(SUBDIRS_LIBS); do \ - cp -rs ../$$dir/lib-release/* .; \ - done; \ - for dir in $(SUBDIRS_BINS); do \ - cp -rs ../$$dir/bin-release/* .; \ - done; \ - cd ..; \ - cp translateAddresses $(addsuffix -release, $(BINFOLDER)); \ - cp xmlFormat $(addsuffix -release, $(BINFOLDER)) - -debug release: - for dir in $(SUBDIRS_LIBS) $(SUBDIRS_BINS); do \ - $(MAKE) $@ -C $$dir || exit 1; \ - done - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# do all main targets - -clean: clean-debug clean-release - $(RM) -r bin-debug bin-release - -clean-debug: - for dir in $(SUBDIRS_WITH_MAKE); do \ - $(MAKE) clean-debug -C $$dir; \ - done - -clean-release: - for dir in $(SUBDIRS_WITH_MAKE); do \ - $(MAKE) clean-release -C $$dir; \ - done - -doc: - doxygen - $(MAKE) doc -C alib2std - $(MAKE) doc -C alib2data - $(MAKE) doc -C alib2common - $(MAKE) doc -C alib2str - $(MAKE) doc -C alib2raw - $(MAKE) doc -C alib2algo - $(MAKE) doc -C alib2elgo - diff --git a/makefile-binary b/makefile-binary deleted file mode 100644 index 879cce9113..0000000000 --- a/makefile-binary +++ /dev/null @@ -1,165 +0,0 @@ -SHELL:=/bin/bash - -LTO_PARAM:= -ifeq ($(USE_LTO),1) -LTO_PARAM:=-flto -endif - -MARCH_PARAM:= -ifneq ($(USE_MARCH),) -MARCH_PARAM:=-march=$(USE_MARCH) -endif - -define NEW_LINE - - -endef - -export NEW_LINE - -CXX_FLAGS := -Wall -pedantic -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls - -INCLUDE_PATHS:=$(addprefix -I, $(realpath $(addsuffix /src, $(addprefix ../, $(LINK_LIBRARIES) $(LIBRARY)))) $(SYSTEM_INCLUDE_PATHS)) - -DEBUG_LINK_PATHS:=$(addsuffix /lib-debug, $(addprefix ../, $(LINK_LIBRARIES))) - -LDFLAGS_DEBUG:=-Wl,--no-as-needed $(addprefix -L, $(DEBUG_LINK_PATHS)) -rdynamic $(addprefix -l, $(LINK_LIBRARIES) $(SYSTEM_LIBRARIES)) -Wl,-rpath,. - -RELEASE_LINK_PATHS:=$(addsuffix /lib-release, $(addprefix ../, $(LINK_LIBRARIES))) - -LDFLAGS_RELEASE:=-Wl,--no-as-needed $(addprefix -L, $(RELEASE_LINK_PATHS)) -rdynamic $(addprefix -l, $(LINK_LIBRARIES) $(SYSTEM_LIBRARIES)) $(LTO_PARAM) -Wl,-rpath,. - -OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(sort $(shell find src/ -name *cpp))) - -OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(sort $(shell find src/ -name *cpp))) - -# --------------------------------------------------------------------------------------------------------------------------------------------------------- -# to handle deleted source files - -EXISTENT_OBJECTS_DEBUG:=$(sort $(shell find obj-debug/ -name *o)) - -EXISTENT_OBJECTS_RELEASE:=$(sort $(shell find obj-release/ -name *o)) - -EXTRA_OBJECTS_DEBUG:=$(filter-out $(OBJECTS_DEBUG), $(EXISTENT_OBJECTS_DEBUG)) - -EXTRA_OBJECTS_RELEASE:=$(filter-out $(OBJECTS_RELEASE), $(EXISTENT_OBJECTS_RELEASE)) - -ifneq ($(strip $(EXTRA_OBJECTS_DEBUG)),) -ifneq ($(wildcard lib-debug/$(FULL_LIBRARY)),) -ifneq ($(firstword $(EXISTENT_OBJECTS_DEBUG)),) -$(shell touch $(firstword $(EXISTENT_OBJECTS_DEBUG))) -endif -endif -endif - -ifneq ($(strip $(EXTRA_OBJECTS_RELEASE)),) -ifneq ($(wildcard lib-release/$(FULL_LIBRARY)),) -ifneq ($(firstword $(EXISTENT_OBJECTS_RELEASE)),) -$(shell touch $(firstword $(EXISTENT_OBJECTS_RELEASE))) -endif -endif -endif - -# --------------------------------------------------------------------------------------------------------------------------------------------------------- - -.PHONY: all build-debug clean-debug doc - -all: - @echo "What to do master?" - -FORCE: - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# make subdir makefile - -%/makefile: ../makefile-binary ../build.conf makefile makefile.conf - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - cp ../makefile-rec $@ - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# final lib/bin construction - -bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG) - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) - -bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE) - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(OBJECTS_RELEASE) -o $@ $(LDFLAGS_RELEASE) - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# subdir make calls - -obj-debug/: FORCE | obj-debug/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -Og -DDEBUG $(CXX_FLAGS) $(INCLUDE_PATHS)" - -obj-release/: FORCE | obj-release/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE $(LTO_PARAM) $(MARCH_PARAM) $(CXX_FLAGS) $(INCLUDE_PATHS)" - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# objects dependencies - -$(OBJECTS_DEBUG): obj-debug/ - -$(OBJECTS_RELEASE): obj-release/ - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# standalone main targets - -build-code-debug: bin-debug/$(EXECUTABLE) - -build-code-release: bin-release/$(EXECUTABLE) - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# do all main targets - -debug: - $(MAKE) build-code-debug - -release: - $(MAKE) build-code-release - -clean: clean-debug clean-release - $(RM) -r doc - -clean-debug: - if [ -L obj-debug ]; then\ - $(RM) -r `readlink obj-debug`;\ - fi - if [ -L bin-debug ]; then\ - $(RM) -r `readlink bin-debug`;\ - fi - $(RM) -r *.o *.d bin-debug obj-debug - -clean-release: - if [ -L obj-release ]; then\ - $(RM) -r `readlink obj-release`;\ - fi - if [ -L lib-release ]; then\ - $(RM) -r `readlink lib-release`;\ - fi - $(RM) -r *.o *.d bin-release obj-release - -doc: - doxygen diff --git a/makefile-library b/makefile-library deleted file mode 100644 index 386e0560f9..0000000000 --- a/makefile-library +++ /dev/null @@ -1,268 +0,0 @@ -SHELL:=/bin/bash - -LTO_PARAM:= -ifeq ($(USE_LTO),1) -LTO_PARAM:=-flto -endif - -MARCH_PARAM:= -ifneq ($(USE_MARCH),) -MARCH_PARAM:=-march=$(USE_MARCH) -endif - -FULL_LIBRARY:=lib$(LIBRARY).so -define NEW_LINE - - -endef - -export NEW_LINE - -CXX_FLAGS := -Wall -pedantic -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls - -space := $(eval) $(eval) - -TEST_LINK_LIBRARIES+= $(LINK_LIBRARIES) $(LIBRARY) -TEST_SYSTEM_LIBRARIES+= $(SYSTEM_LIBRARIES) - - -INCLUDE_PATHS:=$(addprefix -I, $(realpath $(addsuffix /src, $(addprefix ../, $(LINK_LIBRARIES) $(LIBRARY)))) $(SYSTEM_INCLUDE_PATHS)) -TEST_INCLUDE_PATHS:=$(addprefix -I, $(realpath $(addsuffix /src, $(addprefix ../, $(TEST_LINK_LIBRARIES)))) $(TEST_SYSTEM_INCLUDE_PATHS)) - - -DEBUG_LINK_PATHS:=$(addsuffix /lib-debug, $(addprefix ../, $(LINK_LIBRARIES))) -DEBUG_TEST_LINK_PATHS:=$(addsuffix /lib-debug, $(addprefix ../, $(TEST_LINK_LIBRARIES))) - -LDFLAGS_DEBUG:=-rdynamic -shared $(addprefix -L, $(DEBUG_LINK_PATHS)) $(addprefix -l, $(LINK_LIBRARIES) $(SYSTEM_LIBRARIES)) -TEST_LDFLAGS_DEBUG:=-Wl,--no-as-needed $(addprefix -L, $(DEBUG_TEST_LINK_PATHS)) -rdynamic $(addprefix -l, $(TEST_LINK_LIBRARIES) $(TEST_SYSTEM_LIBRARIES)) -lcppunit -Wl,-rpath,. - - -RELEASE_LINK_PATHS:=$(addsuffix /lib-release, $(addprefix ../, $(LINK_LIBRARIES))) -RELEASE_TEST_LINK_PATHS:=$(addsuffix /lib-release, $(addprefix ../, $(TEST_LINK_LIBRARIES))) - -LDFLAGS_RELEASE:=-rdynamic -shared $(LTO_PARAM) $(addprefix -L, $(RELEASE_LINK_PATHS)) $(addprefix -l, $(LINK_LIBRARIES) $(SYSTEM_LIBRARIES)) -TEST_LDFLAGS_RELEASE:=-Wl,--no-as-needed $(addprefix -L, $(RELEASE_TEST_LINK_PATHS)) -rdynamic $(addprefix -l, $(TEST_LINK_LIBRARIES) $(TEST_SYSTEM_LIBRARIES)) -lcppunit $(LTO_PARAM) -Wl,-rpath,. - - -OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(sort $(shell find src/ -name *cpp))) -TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(sort $(shell find test-src/ -name *cpp))) - -OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(sort $(shell find src/ -name *cpp)))) -TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(sort $(shell find test-src/ -name *cpp))) - -# --------------------------------------------------------------------------------------------------------------------------------------------------------- -# to handle deleted source files - -EXISTENT_OBJECTS_DEBUG:=$(sort $(shell find obj-debug/ -name *o)) -EXISTENT_TEST_OBJECTS_DEBUG:=$(sort $(shell find test-obj-debug/ -name *o)) - -EXISTENT_OBJECTS_RELEASE:=$(sort $(shell find obj-release/ -name *o)) -EXISTENT_TEST_OBJECTS_RELEASE:=$(sort $(shell find test-obj-release/ -name *o)) - -EXTRA_OBJECTS_DEBUG:=$(filter-out $(OBJECTS_DEBUG), $(EXISTENT_OBJECTS_DEBUG)) -EXTRA_TEST_OBJECTS_DEBUG:=$(filter-out $(TEST_OBJECTS_DEBUG), $(EXISTENT_TEST_OBJECTS_DEBUG)) - -EXTRA_OBJECTS_RELEASE:=$(filter-out $(OBJECTS_RELEASE), $(EXISTENT_OBJECTS_RELEASE)) -EXTRA_TEST_OBJECTS_RELEASE:=$(filter-out $(TEST_OBJECTS_RELEASE), $(EXISTENT_TEST_OBJECTS_RELEASE)) - -ifneq ($(strip $(EXTRA_OBJECTS_DEBUG)),) -ifneq ($(wildcard lib-debug/$(FULL_LIBRARY)),) -ifneq ($(firstword $(EXISTENT_OBJECTS_DEBUG)),) -$(shell touch $(firstword $(EXISTENT_OBJECTS_DEBUG))) -$(shell rm $(EXTRA_OBJECTS_DEBUG)) -$(shell rm $(patsubst obj-debug/%.o,obj-debug/%.d, $(EXTRA_OBJECTS_DEBUG))) -endif -endif -endif - -ifneq ($(strip $(EXTRA_TEST_OBJECTS_DEBUG)),) -ifneq ($(wildcard test-bin-debug/$(TESTBIN)),) -ifneq ($(firstword $(EXISTENT_TEST_OBJECTS_DEBUG)),) -$(shell touch $(firstword $(EXISTENT_TEST_OBJECTS_DEBUG))) -$(shell rm $(EXTRA_TEST_OBJECTS_DEBUG)) -$(shell rm $(patsubst obj-debug/%.o,obj-debug/%.d, $(EXTRA_TEST_OBJECTS_DEBUG))) -endif -endif -endif - -ifneq ($(strip $(EXTRA_OBJECTS_RELEASE)),) -ifneq ($(wildcard lib-release/$(FULL_LIBRARY)),) -ifneq ($(firstword $(EXISTENT_OBJECTS_RELEASE)),) -$(shell touch $(firstword $(EXISTENT_OBJECTS_RELEASE))) -$(shell rm $(EXTRA_OBJECTS_RELEASE)) -$(shell rm $(patsubst obj-debug/%.o,obj-debug/%.d, $(EXTRA_OBJECTS_RELEASE))) -endif -endif -endif - -ifneq ($(strip $(EXTRA_TEST_OBJECTS_RELEASE)),) -ifneq ($(wildcard test-bin-release/$(TESTBIN)),) -ifneq ($(firstword $(EXISTENT_TEST_OBJECTS_RELEASE)),) -$(shell touch $(firstword $(EXISTENT_TEST_OBJECTS_RELEASE))) -$(shell rm $(EXTRA_TEST_OBJECTS_RELEASE)) -$(shell rm $(patsubst obj-debug/%.o,obj-debug/%.d, $(EXTRA_TEST_OBJECTS_RELEASE))) -endif -endif -endif - -# --------------------------------------------------------------------------------------------------------------------------------------------------------- - -.PHONY: all debug release clean build-debug build-release clean-debug clean-release doc - -all: - @echo "What to do master?" - -FORCE: - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# make subdir makefile - -%/makefile: ../makefile-library ../build.conf makefile makefile.conf - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - cp ../makefile-rec $@ - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# final lib/bin construction - -lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/ - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) - -lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/ - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(OBJECTS_RELEASE) -o $@ $(LDFLAGS_RELEASE) - -test-bin-debug/$(TESTBIN): $(TEST_OBJECTS_DEBUG) test-obj-debug/ - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(TEST_OBJECTS_DEBUG) -o $@ $(TEST_LDFLAGS_DEBUG) - -test-bin-release/$(TESTBIN): $(TEST_OBJECTS_RELEASE) test-obj-release/ - if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ - ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\ - fi;\ - if [ -L $(subst /,, $(dir $@)) ]; then\ - mkdir -p `readlink $(subst /,, $(dir $@))`;\ - else\ - mkdir -p $(dir $@);\ - fi - $(CXX) $(TEST_OBJECTS_RELEASE) -o $@ $(TEST_LDFLAGS_RELEASE) - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# subdir make calls - -obj-debug/: FORCE obj-debug/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -Og -DDEBUG $(CXX_FLAGS) $(INCLUDE_PATHS)" - -obj-release/: FORCE obj-release/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE $(LTO_PARAM) $(MARCH_PARAM) $(CXX_FLAGS) $(INCLUDE_PATHS)" - -test-obj-debug/: FORCE test-obj-debug/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -Og -DDEBUG $(CXX_FLAGS) $(INCLUDE_PATHS) $(TEST_INCLUDE_PATHS)" - -test-obj-release/: FORCE test-obj-release/makefile - $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE $(LTO_PARAM) $(MARCH_PARAM) $(CXX_FLAGS) $(INCLUDE_PATHS) $(TEST_INCLUDE_PATHS)" - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# objects dependencies - -$(OBJECTS_DEBUG): obj-debug/ - -$(OBJECTS_RELEASE): obj-release/ - -$(TEST_OBJECTS_DEBUG): test-obj-debug/ - -$(TEST_OBJECTS_RELEASE): test-obj-release/ - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# standalone main targets - -test-unit-debug: - LD_LIBRARY_PATH="$(subst $(space),:,$(DEBUG_TEST_LINK_PATHS))" test-bin-debug/$(TESTBIN) - -test-unit-release: - LD_LIBRARY_PATH="$(subst $(space),:,$(RELEASE_TEST_LINK_PATHS))" test-bin-release/$(TESTBIN) - -build-test-debug: test-bin-debug/$(TESTBIN) - -build-test-release: test-bin-release/$(TESTBIN) - -build-code-debug: lib-debug/$(FULL_LIBRARY) - -build-code-release: lib-release/$(FULL_LIBRARY) - -# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# do all main targets - -debug: - $(MAKE) build-code-debug - $(MAKE) build-test-debug - $(MAKE) test-unit-debug - -release: - $(MAKE) build-code-release - $(MAKE) build-test-release - $(MAKE) test-unit-release - -clean: clean-debug clean-release - $(RM) -r doc - -clean-debug: - if [ -L obj-debug ]; then\ - $(RM) -r `readlink obj-debug`;\ - fi - if [ -L lib-debug ]; then\ - $(RM) -r `readlink lib-debug`;\ - fi - if [ -L test-obj-debug ]; then\ - $(RM) -r `readlink test-obj-debug`;\ - fi - if [ -L test-bin-debug ]; then\ - $(RM) -r `readlink test-bin-debug`;\ - fi - $(RM) -r *.o *.d lib-debug obj-debug test-bin-debug test-obj-debug CppUnitTestResults.xml - -clean-release: - if [ -L obj-release ]; then\ - $(RM) -r `readlink obj-release`;\ - fi - if [ -L lib-release ]; then\ - $(RM) -r `readlink lib-release`;\ - fi - if [ -L test-obj-release ]; then\ - $(RM) -r `readlink test-obj-release`;\ - fi - if [ -L test-bin-release ]; then\ - $(RM) -r `readlink test-bin-release`;\ - fi - $(RM) -r *.o *.d lib-release obj-release test-bin-release test-obj-release CppUnitTestResults.xml - -doc: - doxygen diff --git a/makefile-rec b/makefile-rec deleted file mode 100644 index bf5b0a25ca..0000000000 --- a/makefile-rec +++ /dev/null @@ -1,46 +0,0 @@ -SHELL:=/bin/bash -SRCDIR:= - -define NEW_LINE - - -endef - -export NEW_LINE - -CXXFLAGS:= -pipe -std=c++14 $(CXX_OTHER_FLAGS) -c -fPIC - -SOURCES:= $(shell find $(SOURCES_BASE_DIR)/$(SRCDIR) -maxdepth 1 -type f -name "*.cpp") -DEPENDENCIES:= $(patsubst $(SOURCES_BASE_DIR)/$(SRCDIR)%.cpp, $(OBJECTS_BASE_DIR)/$(SRCDIR)%.d, $(SOURCES)) -OBJECTS:= $(patsubst %.d, %.o, $(DEPENDENCIES)) -SOURCES_DIRS:= $(shell find $(SOURCES_BASE_DIR)/$(SRCDIR) -maxdepth 1 -mindepth 1 -type d) -OBJECTS_DIRS:= $(patsubst $(SOURCES_BASE_DIR)/$(SRCDIR)%, %/, $(SOURCES_DIRS)) -OBJECTS_DIRS_MAKEFILES:= $(patsubst %, %makefile, $(OBJECTS_DIRS)) - -.PHONY: all -.PRECIOUS: $(DEPENDECIES) $(OBJECTS_DIRS_MAKEFILES) - -all: $(OBJECTS_DIRS) $(OBJECTS) - -%.d: makefile - @echo "\ - $(shell sha1sum <<< "$@" | sed "s/ -//g") = \$$(shell (\$$(CXX) -MM \$$(CXXFLAGS) $(patsubst $(OBJECTS_BASE_DIR)/$(SRCDIR)%.d,$(SOURCES_BASE_DIR)/$(SRCDIR)%.cpp, $@) 2>/dev/null || echo \"$(patsubst $(OBJECTS_BASE_DIR)/$(SRCDIR)%.d,$(SOURCES_BASE_DIR)/$(SRCDIR)%.cpp, $@) FORCE\") | sed \"s/.*://g;s/\\\\\\\\//g\")$${NEW_LINE}\ - $(patsubst %.d,%.o, $@): \$$($(shell sha1sum <<< "$@" | sed "s/ -//g")) makefile$${NEW_LINE}\ - \$$(CXX) \$$(CXXFLAGS) \$$< -o $(patsubst %.d,%.o, $@)$${NEW_LINE}\ - " > $@ - -%/makefile: makefile - mkdir -p $(dir $@) - cp makefile $@ - -%/: FORCE | %/makefile - @accesstime=`stat -c %Y $@` && \ - $(MAKE) -C $@ SRCDIR=$(SRCDIR)$(notdir $(patsubst %/, %, $@))/ OBJECTS_BASE_DIR=$(OBJECTS_BASE_DIR) SOURCES_BASE_DIR=$(SOURCES_BASE_DIR) CXX_OTHER_FLAGS="$(CXX_OTHER_FLAGS)" && \ - accesstime2=`stat -c %Y $@` && \ - if [ $$accesstime -ne $$accesstime2 ]; then \ - touch .; \ - fi - -FORCE: - --include $(DEPENDENCIES) diff --git a/tniceprint/makefile b/tniceprint/makefile deleted file mode 100644 index bd9fb6f7bc..0000000000 --- a/tniceprint/makefile +++ /dev/null @@ -1,3 +0,0 @@ --include makefile.conf --include ../build.conf --include ../makefile-binary diff --git a/tniceprint/makefile.conf b/tniceprint/makefile.conf index f3454f9d08..ecd8ef76d4 100644 --- a/tniceprint/makefile.conf +++ b/tniceprint/makefile.conf @@ -1,4 +1,2 @@ -EXECUTABLE:=tniceprint LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2xml alib2common alib2abstraction alib2measure alib2std SYSTEM_LIBRARIES=xml2 -SYSTEM_INCLUDE_PATHS=/usr/include/libxml2 -- GitLab