From 2e654b19f38f1f941c70a5adcdac6311234362c3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 10 Jun 2021 16:27:06 -0700 Subject: [PATCH] treewide: back to cmake.mk Ninja was merged to base and therefore we can now use normal cmake.mk Signed-off-by: Rosen Penev --- lang/lua-cjson/Makefile | 2 +- lang/lua-ev/Makefile | 2 +- lang/lua-openssl/Makefile | 2 +- lang/lualanes/Makefile | 2 +- lang/luv/Makefile | 2 +- lang/lzmq/Makefile | 2 +- libs/afalg_engine/Makefile | 2 +- libs/c-ares/Makefile | 2 +- libs/cereal/Makefile | 2 +- libs/check/Makefile | 2 +- libs/cjson/Makefile | 2 +- libs/czmq/Makefile | 2 +- libs/elektra/Makefile | 2 +- libs/expat/Makefile | 2 +- libs/getdns/Makefile | 2 +- libs/gost_engine/Makefile | 2 +- libs/h2o/Makefile | 2 +- libs/ipfs-http-client/Makefile | 2 +- libs/leptonica/Makefile | 2 +- libs/libarchive/Makefile | 2 +- libs/libcbor/Makefile | 2 +- libs/libebml/Makefile | 2 +- libs/libevhtp/Makefile | 2 +- libs/libfido2/Makefile | 2 +- libs/libfmt/Makefile | 2 +- libs/libftdi/Makefile | 2 +- libs/libftdi1/Makefile | 2 +- libs/libgd/Makefile | 2 +- libs/libical/Makefile | 2 +- libs/libiio/Makefile | 2 +- libs/libjpeg-turbo/Makefile | 2 +- libs/liblo/Makefile | 2 +- libs/libmariadb/Makefile | 2 +- libs/libmatroska/Makefile | 2 +- libs/libmaxminddb/Makefile | 2 +- libs/libmraa/Makefile | 2 +- libs/libnatpmp/Makefile | 2 +- libs/libnetconf2/Makefile | 2 +- libs/liborcania/Makefile | 2 +- libs/libpng/Makefile | 2 +- libs/libpqxx/Makefile | 2 +- libs/libradiotap/Makefile | 2 +- libs/libre2/Makefile | 2 +- libs/libroxml/Makefile | 2 +- libs/libsndfile/Makefile | 2 +- libs/libsoxr/Makefile | 2 +- libs/libssh/Makefile | 2 +- libs/libssh2/Makefile | 2 +- libs/libtins/Makefile | 2 +- libs/libtorrent-rasterbar/Makefile | 2 +- libs/libuecc/Makefile | 2 +- libs/libuhttpd/Makefile | 2 +- libs/libulfius/Makefile | 2 +- libs/libupm/Makefile | 2 +- libs/libupnp/Makefile | 2 +- libs/libuv/Makefile | 2 +- libs/libuwsc/Makefile | 2 +- libs/libvorbis/Makefile | 2 +- libs/libwebp/Makefile | 2 +- libs/libwebsockets/Makefile | 2 +- libs/libwslay/Makefile | 2 +- libs/libxerces-c/Makefile | 2 +- libs/libyaml-cpp/Makefile | 2 +- libs/libyang/Makefile | 2 +- libs/libzip/Makefile | 2 +- libs/log4cplus/Makefile | 2 +- libs/lzo/Makefile | 2 +- libs/minizip/Makefile | 2 +- libs/nghttp2/Makefile | 2 +- libs/pcre2/Makefile | 2 +- libs/protobuf-c/Makefile | 2 +- libs/protobuf/Makefile | 2 +- libs/pugixml/Makefile | 2 +- libs/qrencode/Makefile | 2 +- libs/spdlog/Makefile | 2 +- libs/taglib/Makefile | 2 +- libs/tiff/Makefile | 2 +- libs/uci2/Makefile | 2 +- libs/websocketpp/Makefile | 2 +- libs/yajl/Makefile | 2 +- libs/zmq/Makefile | 2 +- multimedia/gerbera/Makefile | 2 +- multimedia/mjpg-streamer/Makefile | 2 +- multimedia/v4l2rtspserver/Makefile | 2 +- net/apfree-wifidog/Makefile | 2 +- net/cgi-io/Makefile | 2 +- net/clamav/Makefile | 2 +- net/cshark/Makefile | 2 +- net/dawn/Makefile | 2 +- net/etherwake-nfqueue/Makefile | 2 +- net/https-dns-proxy/Makefile | 2 +- net/lora-gateway-hal/Makefile | 2 +- net/mbusd/Makefile | 2 +- net/miniupnpc/Makefile | 2 +- net/netopeer2/Makefile | 2 +- net/nginx-util/Makefile | 2 +- net/nlbwmon/Makefile | 2 +- net/phantap/Makefile | 2 +- net/ratechecker/Makefile | 2 +- net/snort3/Makefile | 2 +- net/softethervpn5/Makefile | 2 +- net/spawn-fcgi/Makefile | 2 +- net/stubby/Makefile | 2 +- net/sysrepo/Makefile | 2 +- net/umurmur/Makefile | 2 +- net/vallumd/Makefile | 2 +- net/znc/Makefile | 2 +- sound/portaudio/Makefile | 2 +- utils/auc/Makefile | 2 +- utils/canutils/Makefile | 2 +- utils/dbus/Makefile | 2 +- utils/domoticz/Makefile | 2 +- utils/ecdsautils/Makefile | 2 +- utils/fish/Makefile | 2 +- utils/gammu/Makefile | 2 +- utils/mariadb/Makefile | 2 +- utils/netwhere/Makefile | 2 +- utils/openobex/Makefile | 2 +- utils/rpcd-mod-lxc/Makefile | 2 +- utils/rtl-sdr/Makefile | 2 +- utils/rtl_433/Makefile | 2 +- utils/rtty/Makefile | 2 +- utils/sumo/Makefile | 2 +- utils/taskwarrior/Makefile | 2 +- utils/telldus-core/Makefile | 2 +- utils/tesseract/Makefile | 2 +- utils/tini/Makefile | 2 +- utils/ttyd/Makefile | 2 +- utils/uledd/Makefile | 2 +- utils/uvcdynctrl/Makefile | 2 +- 130 files changed, 130 insertions(+), 130 deletions(-) diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile index 8e8499acbf..de727346a8 100644 --- a/lang/lua-cjson/Makefile +++ b/lang/lua-cjson/Makefile @@ -22,7 +22,7 @@ HOST_BUILD_DEPENDS:=lua/host include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/lua-cjson SUBMENU:=Lua diff --git a/lang/lua-ev/Makefile b/lang/lua-ev/Makefile index 5c1f9dfc9f..b1000d980b 100644 --- a/lang/lua-ev/Makefile +++ b/lang/lua-ev/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/lua-ev SUBMENU:=Lua diff --git a/lang/lua-openssl/Makefile b/lang/lua-openssl/Makefile index 5bbcee0377..c071ca123b 100644 --- a/lang/lua-openssl/Makefile +++ b/lang/lua-openssl/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/lua-openssl SUBMENU:=Lua diff --git a/lang/lualanes/Makefile b/lang/lualanes/Makefile index 0a6b87b653..16395b43be 100644 --- a/lang/lualanes/Makefile +++ b/lang/lualanes/Makefile @@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=COPYRIGHT PKG_BUILD_DEPENDS:=lua/host include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/lualanes SUBMENU:=Lua diff --git a/lang/luv/Makefile b/lang/luv/Makefile index 35cf2e850d..3ee45d2d8a 100644 --- a/lang/luv/Makefile +++ b/lang/luv/Makefile @@ -13,7 +13,7 @@ PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/luv SUBMENU:=Lua diff --git a/lang/lzmq/Makefile b/lang/lzmq/Makefile index ed7e5199f8..210b88ed3c 100644 --- a/lang/lzmq/Makefile +++ b/lang/lzmq/Makefile @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/tar.gz/v$(PKG_VERSION)? PKG_HASH:=cf70200045b8bcb0e929c338ad421b6a291cf1038053532888dc201af3224d8b include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/lzmq SUBMENU:=Lua diff --git a/libs/afalg_engine/Makefile b/libs/afalg_engine/Makefile index 6dcc67a937..c312c4a884 100644 --- a/libs/afalg_engine/Makefile +++ b/libs/afalg_engine/Makefile @@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_AFALG_ZERO_COPY include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk ENGINES_DIR:=engines-1.1 diff --git a/libs/c-ares/Makefile b/libs/c-ares/Makefile index edc8f9fcdc..885b818124 100644 --- a/libs/c-ares/Makefile +++ b/libs/c-ares/Makefile @@ -23,7 +23,7 @@ PKG_CPE_ID:=cpe:/a:c-ares_project:c-ares CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libcares SECTION:=libs diff --git a/libs/cereal/Makefile b/libs/cereal/Makefile index 2eaec58b44..46b2998412 100644 --- a/libs/cereal/Makefile +++ b/libs/cereal/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += \ -DCMAKE_CXX_FLAGS=-latomic \ diff --git a/libs/check/Makefile b/libs/check/Makefile index 127bc15163..717e88f4b8 100644 --- a/libs/check/Makefile +++ b/libs/check/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING.LESSER CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/check SECTION:=libs diff --git a/libs/cjson/Makefile b/libs/cjson/Makefile index cf5f3841a5..1bd9b80b32 100644 --- a/libs/cjson/Makefile +++ b/libs/cjson/Makefile @@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:cjson_project:cjson include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/cJSON SECTION:=libs diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile index 7cd2da1c3d..45b74bfb40 100644 --- a/libs/czmq/Makefile +++ b/libs/czmq/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/czmq SECTION:=libs diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index 1115f271f7..6a719c3726 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -32,7 +32,7 @@ PKG_SOURCE_URL:=http://ftp.libelektra.org/ftp/elektra/releases PKG_BUILD_DEPENDS:= lua include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/nls.mk define Package/libelektra/Default diff --git a/libs/expat/Makefile b/libs/expat/Makefile index 0f169e5158..ba91114c51 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -22,7 +22,7 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libexpat SECTION:=libs diff --git a/libs/getdns/Makefile b/libs/getdns/Makefile index dffed2b29a..591f7613af 100644 --- a/libs/getdns/Makefile +++ b/libs/getdns/Makefile @@ -23,7 +23,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_GETDNS_ENABLE_IDN_LIBIDN2 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/getdns/Default TITLE:=getdns diff --git a/libs/gost_engine/Makefile b/libs/gost_engine/Makefile index 28fde5b8bb..00b55e7c23 100644 --- a/libs/gost_engine/Makefile +++ b/libs/gost_engine/Makefile @@ -12,7 +12,7 @@ PKG_MAINTAINER:=Artur Petrov PKG_LICENSE:=OpenSSL include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)" PKG_INSTALL:= diff --git a/libs/h2o/Makefile b/libs/h2o/Makefile index fc3d098963..59f2e30476 100644 --- a/libs/h2o/Makefile +++ b/libs/h2o/Makefile @@ -13,7 +13,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk PKG_BUILD_DEPENDS:=libwslay diff --git a/libs/ipfs-http-client/Makefile b/libs/ipfs-http-client/Makefile index 1b6e42c7fc..c434e349ae 100644 --- a/libs/ipfs-http-client/Makefile +++ b/libs/ipfs-http-client/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE_FILES:=LICENSE.MIT PKG_BUILD_DEPENDS:=nlohmannjson include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/ipfs-http-client/Default/description IPFS (the InterPlanetary File System) is the Distributed Web. diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile index b0155ca570..4997ce9457 100644 --- a/libs/leptonica/Makefile +++ b/libs/leptonica/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=leptonica-license.txt CMAKE_BINARY_SUBDIR:=openwrt-build include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libleptonica SECTION:=libs diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index b74b244530..3f88ac6465 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libarchive:libarchive include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libarchive/Default SECTION:=libs diff --git a/libs/libcbor/Makefile b/libs/libcbor/Makefile index 5cab3d5f28..7c0735f28f 100644 --- a/libs/libcbor/Makefile +++ b/libs/libcbor/Makefile @@ -24,7 +24,7 @@ CMAKE_OPTIONS += \ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libcbor SECTION:=libs diff --git a/libs/libebml/Makefile b/libs/libebml/Makefile index a9ac1288a7..5df9fe743e 100644 --- a/libs/libebml/Makefile +++ b/libs/libebml/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE.LGPL CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libebml SECTION:=libs diff --git a/libs/libevhtp/Makefile b/libs/libevhtp/Makefile index 2c55c380ef..8065d40ed1 100644 --- a/libs/libevhtp/Makefile +++ b/libs/libevhtp/Makefile @@ -31,7 +31,7 @@ CMAKE_INSTALL:=1 PKG_CONFIG_DEPENDS:=LIBEVHTP_BUILD_DEPENDS include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libevhtp SECTION:=libs diff --git a/libs/libfido2/Makefile b/libs/libfido2/Makefile index 4e4438eaa0..8fd8aae945 100644 --- a/libs/libfido2/Makefile +++ b/libs/libfido2/Makefile @@ -25,7 +25,7 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libfido2 SECTION:=libs diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index 00b7a52be5..1f2e359b5f 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -24,7 +24,7 @@ PKG_LICENSE_FILES:=LICENSE.rst CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DBUILD_SHARED_LIBS=ON CMAKE_OPTIONS += -DFMT_DOC=OFF diff --git a/libs/libftdi/Makefile b/libs/libftdi/Makefile index dddd8a1c5e..f644b53210 100644 --- a/libs/libftdi/Makefile +++ b/libs/libftdi/Makefile @@ -23,7 +23,7 @@ CMAKE_INSTALL:=1 PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libftdi SECTION:=libs diff --git a/libs/libftdi1/Makefile b/libs/libftdi1/Makefile index e0bcf26194..dee2b65730 100644 --- a/libs/libftdi1/Makefile +++ b/libs/libftdi1/Makefile @@ -23,7 +23,7 @@ CMAKE_INSTALL:=1 PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libftdi1 SECTION:=libs diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 49ad7003c0..0e614ea1fa 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libgd:libgd include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libgd/default SECTION:=libs diff --git a/libs/libical/Makefile b/libs/libical/Makefile index dc8385d5ad..3d6c88b141 100644 --- a/libs/libical/Makefile +++ b/libs/libical/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libical SECTION:=libs diff --git a/libs/libiio/Makefile b/libs/libiio/Makefile index 33c91ac617..523abd339a 100644 --- a/libs/libiio/Makefile +++ b/libs/libiio/Makefile @@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DWITH_DOC=OFF CMAKE_OPTIONS += -DENABLE_IPV6=$(if $(CONFIG_IPV6),ON,OFF) diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index ba29eb13c3..8aad8b2e1d 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/libs/libjpeg-turbo/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=LICENSE.md PKG_USE_MIPS16:=0 #Allows ASM compilation for speed. include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libjpeg-turbo/Default TITLE:=libjpeg-turbo diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile index d1ef6f5298..2b44ecf2ff 100644 --- a/libs/liblo/Makefile +++ b/libs/liblo/Makefile @@ -24,7 +24,7 @@ CMAKE_SOURCE_SUBDIR:=cmake PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/liblo/Default TITLE:=Lightweight Open Sound Control (OSC) diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile index eba16105aa..88ffb6e722 100644 --- a/libs/libmariadb/Makefile +++ b/libs/libmariadb/Makefile @@ -44,7 +44,7 @@ plugin-remote_io := CLIENT_PLUGIN_REMOTE_IO include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk # Pass CPPFLAGS in the CFLAGS as otherwise the build system will # ignore them. diff --git a/libs/libmatroska/Makefile b/libs/libmatroska/Makefile index f35bb0389a..ac8c2d61de 100644 --- a/libs/libmatroska/Makefile +++ b/libs/libmatroska/Makefile @@ -22,7 +22,7 @@ CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=libebml include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libmatroska SECTION:=libs diff --git a/libs/libmaxminddb/Makefile b/libs/libmaxminddb/Makefile index e81ecb62f5..d142967bf3 100644 --- a/libs/libmaxminddb/Makefile +++ b/libs/libmaxminddb/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libmaxminddb SECTION:=libs diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile index 766135386f..bb65a56878 100644 --- a/libs/libmraa/Makefile +++ b/libs/libmraa/Makefile @@ -26,7 +26,7 @@ PKG_USE_MIPS16:=0 PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk include ../../lang/python/python3-package.mk CMAKE_OPTIONS += \ diff --git a/libs/libnatpmp/Makefile b/libs/libnatpmp/Makefile index eb55976947..f66a82287f 100644 --- a/libs/libnatpmp/Makefile +++ b/libs/libnatpmp/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libnatpmp/Default TITLE:=NAT Port Mapping Protocol (NAT-PMP) diff --git a/libs/libnetconf2/Makefile b/libs/libnetconf2/Makefile index c5e8f4b1f6..cb0aacca13 100644 --- a/libs/libnetconf2/Makefile +++ b/libs/libnetconf2/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libnetconf2 SECTION:=libs diff --git a/libs/liborcania/Makefile b/libs/liborcania/Makefile index 753f25a6ac..7862670a90 100644 --- a/libs/liborcania/Makefile +++ b/libs/liborcania/Makefile @@ -21,7 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/orcania-$(PKG_VERSION) CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/liborcania SECTION:=libs diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index 1a131560d7..cc00e0c3c4 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -21,7 +21,7 @@ PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE PKG_CPE_ID:=cpe:/a:libpng:libpng include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libpng SECTION:=libs diff --git a/libs/libpqxx/Makefile b/libs/libpqxx/Makefile index cb197e4822..6d50a8f9d5 100644 --- a/libs/libpqxx/Makefile +++ b/libs/libpqxx/Makefile @@ -14,7 +14,7 @@ CMAKE_INSTALL:=1 PKG_MAINTAINER:=Igor Bezzubchenko include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libpqxx SECTION:=libs diff --git a/libs/libradiotap/Makefile b/libs/libradiotap/Makefile index 1d38e427d0..4789613909 100644 --- a/libs/libradiotap/Makefile +++ b/libs/libradiotap/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE:=ISC PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libradiotap SECTION:=libs diff --git a/libs/libre2/Makefile b/libs/libre2/Makefile index 44f44af294..972cbf29b1 100644 --- a/libs/libre2/Makefile +++ b/libs/libre2/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/re2 SECTION:=libs diff --git a/libs/libroxml/Makefile b/libs/libroxml/Makefile index 8e35a655b4..a674f84cd5 100644 --- a/libs/libroxml/Makefile +++ b/libs/libroxml/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=License.txt CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libroxml SECTION:=libs diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile index 6c269eeae2..5a06336880 100644 --- a/libs/libsndfile/Makefile +++ b/libs/libsndfile/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libsndfile_project:libsndfile include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libsndfile SECTION:=libs diff --git a/libs/libsoxr/Makefile b/libs/libsoxr/Makefile index 8f102bef3e..b1b20f36ba 100644 --- a/libs/libsoxr/Makefile +++ b/libs/libsoxr/Makefile @@ -24,7 +24,7 @@ PKG_CPE_ID:=cpe:/a:sox:sox CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libsoxr SECTION:=libs diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile index fa05b920bf..29462cb94b 100644 --- a/libs/libssh/Makefile +++ b/libs/libssh/Makefile @@ -25,7 +25,7 @@ CMAKE_BINARY_SUBDIR:=build PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libssh SECTION:=libs diff --git a/libs/libssh2/Makefile b/libs/libssh2/Makefile index 96f6db56a7..bf4493f36c 100644 --- a/libs/libssh2/Makefile +++ b/libs/libssh2/Makefile @@ -27,7 +27,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBSSH2_OPENSSL include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libssh2 SECTION:=libs diff --git a/libs/libtins/Makefile b/libs/libtins/Makefile index d0586db380..392ebfc6fb 100644 --- a/libs/libtins/Makefile +++ b/libs/libtins/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libtins SECTION:=net diff --git a/libs/libtorrent-rasterbar/Makefile b/libs/libtorrent-rasterbar/Makefile index bbf57b7b06..d925ad075f 100644 --- a/libs/libtorrent-rasterbar/Makefile +++ b/libs/libtorrent-rasterbar/Makefile @@ -13,7 +13,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libtorrent-rasterbar/Default TITLE:=Rasterbar BitTorrent library diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile index 750cc2d0bb..57ca7a377f 100644 --- a/libs/libuecc/Makefile +++ b/libs/libuecc/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYRIGHT include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libuecc SECTION:=libs diff --git a/libs/libuhttpd/Makefile b/libs/libuhttpd/Makefile index 93318ef686..8fdee1a166 100644 --- a/libs/libuhttpd/Makefile +++ b/libs/libuhttpd/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libuhttpd/Default SECTION:=libs diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index 510fc17063..b1f77a6f40 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -16,7 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/ulfius-$ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libulfius/default SECTION:=libs diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index b211209178..7fbf278ec1 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -26,7 +26,7 @@ PKG_USE_MIPS16:=0 PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk include ../../lang/python/python3-package.mk UPM_MODULES:= \ diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index e0914d714e..f98fed5131 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -18,7 +18,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_IPV6 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libupnp/Default SECTION:=libs diff --git a/libs/libuv/Makefile b/libs/libuv/Makefile index 1a0d57f8e6..251cc55f70 100644 --- a/libs/libuv/Makefile +++ b/libs/libuv/Makefile @@ -24,7 +24,7 @@ PKG_CPE_ID:=cpe:/a:libuv_project:libuv CMAKE_BINARY_SUBDIR:=out/cmake include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libuv SECTION:=libs diff --git a/libs/libuwsc/Makefile b/libs/libuwsc/Makefile index 089d42c818..41f7609f0b 100644 --- a/libs/libuwsc/Makefile +++ b/libs/libuwsc/Makefile @@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBUWSC_nossl_LUA_BINDING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libuwsc/Default SECTION:=libs diff --git a/libs/libvorbis/Makefile b/libs/libvorbis/Makefile index bcf41d0984..a0fc903612 100644 --- a/libs/libvorbis/Makefile +++ b/libs/libvorbis/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:xiph.org:libvorbis include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libvorbis SECTION:=libs diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile index 258c990902..09ad2fdb81 100644 --- a/libs/libwebp/Makefile +++ b/libs/libwebp/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=COPYING CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libwebp SECTION:=libs diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index d8dbdf9449..365e541283 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -24,7 +24,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF) CMAKE_OPTIONS += -DISABLE_WERROR=ON diff --git a/libs/libwslay/Makefile b/libs/libwslay/Makefile index 64d49e4163..63bf5a27a3 100644 --- a/libs/libwslay/Makefile +++ b/libs/libwslay/Makefile @@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=COPYING CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libwslay SECTION:=libs diff --git a/libs/libxerces-c/Makefile b/libs/libxerces-c/Makefile index ee214f21e4..f32707b00f 100644 --- a/libs/libxerces-c/Makefile +++ b/libs/libxerces-c/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libxerces-c/Default SECTION:=libs diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile index 139aa69d0f..e50f6d709e 100644 --- a/libs/libyaml-cpp/Makefile +++ b/libs/libyaml-cpp/Makefile @@ -24,7 +24,7 @@ PKG_CPE_ID:=cpe:/a:yaml-cpp_project:yaml-cpp CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libyaml-cpp SECTION:=development diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 5b8ac76107..8f99b46b52 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -23,7 +23,7 @@ CMAKE_INSTALL:=1 CMAKE_BINARY_SUBDIR:=build include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libyang SECTION:=libs diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 12a5e21542..818f64cc0a 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libzip/Default TITLE:=libzip ($(2)) diff --git a/libs/log4cplus/Makefile b/libs/log4cplus/Makefile index 52bafe2d81..dcdd9f3e84 100644 --- a/libs/log4cplus/Makefile +++ b/libs/log4cplus/Makefile @@ -24,7 +24,7 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/log4cplus SECTION:=libs diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile index 46400c7755..0e4e678cbb 100644 --- a/libs/lzo/Makefile +++ b/libs/lzo/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING CMAKE_BINARY_SUBDIR:=openwrt-build include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/liblzo SECTION:=libs diff --git a/libs/minizip/Makefile b/libs/minizip/Makefile index 0965b72f51..72c78df49e 100644 --- a/libs/minizip/Makefile +++ b/libs/minizip/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE:=Zlib PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ diff --git a/libs/nghttp2/Makefile b/libs/nghttp2/Makefile index 9040815858..eb5d1a7922 100644 --- a/libs/nghttp2/Makefile +++ b/libs/nghttp2/Makefile @@ -13,7 +13,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libnghttp2 SECTION:=libs diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile index efc8944d69..4d4ffb1101 100644 --- a/libs/pcre2/Makefile +++ b/libs/pcre2/Makefile @@ -26,7 +26,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_PCRE2_JIT_ENABLED include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libpcre2/default SECTION:=libs diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile index 9039bfcac1..320cf7871c 100644 --- a/libs/protobuf-c/Makefile +++ b/libs/protobuf-c/Makefile @@ -29,7 +29,7 @@ CMAKE_SOURCE_SUBDIR:=build-cmake include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libprotobuf-c TITLE:=Protocol Buffers library diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index 59ac2b709b..47a109775b 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -24,7 +24,7 @@ CMAKE_SOURCE_SUBDIR:=cmake include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/protobuf/Default SECTION:=libs diff --git a/libs/pugixml/Makefile b/libs/pugixml/Makefile index 0a16f389e2..1b5c779fba 100644 --- a/libs/pugixml/Makefile +++ b/libs/pugixml/Makefile @@ -18,7 +18,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/pugixml SECTION:=libs diff --git a/libs/qrencode/Makefile b/libs/qrencode/Makefile index c5a36c2199..8411284803 100644 --- a/libs/qrencode/Makefile +++ b/libs/qrencode/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_qrencode include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libqrencode SECTION:=libs diff --git a/libs/spdlog/Makefile b/libs/spdlog/Makefile index a4e6aef8fc..b3ee4e08ed 100644 --- a/libs/spdlog/Makefile +++ b/libs/spdlog/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/spdlog SECTION:=libs diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index 8514d5c3e1..a196725e94 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=COPYING.LGPL PKG_CPE_ID:=cpe:/a:taglib:taglib include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/taglib SECTION:=libs diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index fbdfbb45ed..98f96aa078 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYRIGHT PKG_CPE_ID:=cpe:/a:libtiff:libtiff include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/tiff/Default TITLE:=TIFF diff --git a/libs/uci2/Makefile b/libs/uci2/Makefile index 6c1dbf23d5..456701c4d6 100644 --- a/libs/uci2/Makefile +++ b/libs/uci2/Makefile @@ -14,7 +14,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libuci2/Default TITLE:=AST-based C parser library for UCI diff --git a/libs/websocketpp/Makefile b/libs/websocketpp/Makefile index ea692c66ad..3260c70f82 100644 --- a/libs/websocketpp/Makefile +++ b/libs/websocketpp/Makefile @@ -17,7 +17,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_INSTALL:=1 diff --git a/libs/yajl/Makefile b/libs/yajl/Makefile index 1e313c4bc3..8caffc6a8d 100644 --- a/libs/yajl/Makefile +++ b/libs/yajl/Makefile @@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=COPYING CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/yajl SECTION:=libs diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index fcefc6443b..3803544bcf 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -25,7 +25,7 @@ PKG_CPE_ID:=cpe:/a:zeromq:libzmq CMAKE_BINARY_SUBDIR:=openwrt-build include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libzmq/default TITLE:=ZeroMQ - Message Queue engine diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile index 6bf45cfa3c..ad4618ad21 100644 --- a/multimedia/gerbera/Makefile +++ b/multimedia/gerbera/Makefile @@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_BUILD_PATENTED include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/gerbera SECTION:=multimedia diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 7ad040fdd8..5fc943c872 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -22,7 +22,7 @@ PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip=2 -xf $(DL_DIR)/$(PKG_SOURCE) PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l zmq protobuf-c/host include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/mjpg-streamer SECTION:=multimedia diff --git a/multimedia/v4l2rtspserver/Makefile b/multimedia/v4l2rtspserver/Makefile index b202628bf2..74f4cb42dc 100644 --- a/multimedia/v4l2rtspserver/Makefile +++ b/multimedia/v4l2rtspserver/Makefile @@ -25,7 +25,7 @@ PKG_LICENSE:=Unlicense PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/v4l2rtspserver SECTION:=multimedia diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile index 4fa2ebb1ab..31334fb8e6 100644 --- a/net/apfree-wifidog/Makefile +++ b/net/apfree-wifidog/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/apfree-wifidog SUBMENU:=Captive Portals diff --git a/net/cgi-io/Makefile b/net/cgi-io/Makefile index 3b6ca337f3..9384a1b72b 100644 --- a/net/cgi-io/Makefile +++ b/net/cgi-io/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=John Crispin include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/cgi-io SECTION:=net diff --git a/net/clamav/Makefile b/net/clamav/Makefile index 0e07870977..970a5c1884 100644 --- a/net/clamav/Makefile +++ b/net/clamav/Makefile @@ -25,7 +25,7 @@ PKG_BUILD_DEPENDS:=ncurses include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/clamav/Default SECTION:=net diff --git a/net/cshark/Makefile b/net/cshark/Makefile index 0dce292080..a16e7cccc4 100644 --- a/net/cshark/Makefile +++ b/net/cshark/Makefile @@ -20,7 +20,7 @@ PKG_MAINTAINER:=Luka Perkov PKG_LICENSE:=BSD-2-Clause include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/cshark SECTION:=net diff --git a/net/dawn/Makefile b/net/dawn/Makefile index 2178cd8b13..a337393689 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -18,7 +18,7 @@ PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/dawn SECTION:=net diff --git a/net/etherwake-nfqueue/Makefile b/net/etherwake-nfqueue/Makefile index a62705d4d6..19897f7a65 100644 --- a/net/etherwake-nfqueue/Makefile +++ b/net/etherwake-nfqueue/Makefile @@ -20,7 +20,7 @@ PKG_MAINTAINER:=Mister Benjamin <144dbspl@gmail.com> PKG_LICENSE:=GPL-2.0-or-later include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/etherwake-nfqueue SECTION:=net diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 89a9ccbd23..73d0a07cf4 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -14,7 +14,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DCLANG_TIDY_EXE= diff --git a/net/lora-gateway-hal/Makefile b/net/lora-gateway-hal/Makefile index 9a8b4f9411..80e802b17b 100644 --- a/net/lora-gateway-hal/Makefile +++ b/net/lora-gateway-hal/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DIR:=$(BUILD_DIR)/lora_gateway-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libloragw SECTION:=libs diff --git a/net/mbusd/Makefile b/net/mbusd/Makefile index e933532cd5..45f3104839 100644 --- a/net/mbusd/Makefile +++ b/net/mbusd/Makefile @@ -13,7 +13,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/mbusd SECTION:=net diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index ebc87e5fe5..c5aaebe718 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:miniupnp_project:miniupnp include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/miniupnpc/Default TITLE:=Lightweight UPnP diff --git a/net/netopeer2/Makefile b/net/netopeer2/Makefile index 3f72d73859..3f234d4ce3 100644 --- a/net/netopeer2/Makefile +++ b/net/netopeer2/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/netopeer2-server SECTION:=utils diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index e78963225b..b1d9c5e6fa 100644 --- a/net/nginx-util/Makefile +++ b/net/nginx-util/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_MAINTAINER:=Peter Stadler include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS+= -DUBUS=y CMAKE_OPTIONS+= -DVERSION=$(PKG_VERSION) diff --git a/net/nlbwmon/Makefile b/net/nlbwmon/Makefile index d3a27573e1..9e3a8ba75e 100644 --- a/net/nlbwmon/Makefile +++ b/net/nlbwmon/Makefile @@ -16,7 +16,7 @@ PKG_LICENSE:=ISC PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DLIBNL_LIBRARY_TINY=ON TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny diff --git a/net/phantap/Makefile b/net/phantap/Makefile index 4c9cd61841..298625f649 100644 --- a/net/phantap/Makefile +++ b/net/phantap/Makefile @@ -20,7 +20,7 @@ PKG_MAINTAINER:=Diana Dragusin , \ PKG_LICENSE:=GPL-3.0-only include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_SOURCE_SUBDIR:=src diff --git a/net/ratechecker/Makefile b/net/ratechecker/Makefile index 78fed2d0a2..f06cdcadea 100644 --- a/net/ratechecker/Makefile +++ b/net/ratechecker/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/ratechecker SECTION:=net diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 8ccb3f5e75..8c4025f875 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:snort:snort include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/snort3 SUBMENU:=Firewall diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index f9dca57393..748a0d40a7 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -23,7 +23,7 @@ PKG_BUILD_DEPENDS:=softethervpn5/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/softethervpn5/Default SECTION:=net diff --git a/net/spawn-fcgi/Makefile b/net/spawn-fcgi/Makefile index 04032a467f..3ed0fff534 100644 --- a/net/spawn-fcgi/Makefile +++ b/net/spawn-fcgi/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/spawn-fcgi SUBMENU:=Web Servers/Proxies diff --git a/net/stubby/Makefile b/net/stubby/Makefile index 30002c34e8..3757495d9e 100644 --- a/net/stubby/Makefile +++ b/net/stubby/Makefile @@ -18,7 +18,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/stubby/Default TITLE:=stubby diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index fe812f52b8..8b8c78ab61 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -24,7 +24,7 @@ PKG_BUILD_DEPENDS:=swig/host PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk include ../../lang/python/python3-package.mk define Package/libsysrepo diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index 06dedd88c8..5f5c3fae8c 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/umurmur/Default SECTION:=net diff --git a/net/vallumd/Makefile b/net/vallumd/Makefile index 7277bf721c..e673b94065 100644 --- a/net/vallumd/Makefile +++ b/net/vallumd/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/vallumd SECTION:=net diff --git a/net/znc/Makefile b/net/znc/Makefile index f40f546e61..694247e364 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -272,7 +272,7 @@ $(eval $(call webskin,ice)) PKG_CONFIG_DEPENDS += $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES)) include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += \ -DWANT_ICU=O$(if $(CONFIG_ZNC_ICU),N,FF) \ diff --git a/sound/portaudio/Makefile b/sound/portaudio/Makefile index 6519e20269..0465a01f79 100644 --- a/sound/portaudio/Makefile +++ b/sound/portaudio/Makefile @@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=LICENSE.txt CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/portaudio SECTION:=sound diff --git a/utils/auc/Makefile b/utils/auc/Makefile index 9bd0df8dcf..4faf38bf9c 100644 --- a/utils/auc/Makefile +++ b/utils/auc/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=GPL-3.0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/auc SECTION:=base diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile index 1b45fdafc0..d1d94229eb 100644 --- a/utils/canutils/Makefile +++ b/utils/canutils/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/canutils/Default SECTION:=utils diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 5fc4da22c6..da8a7bef30 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=AFL-2.1 PKG_CPE_ID:=cpe:/a:freedesktop:dbus include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/dbus/Default SECTION:=utils diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile index a7dc4a3a04..7ec5929c44 100644 --- a/utils/domoticz/Makefile +++ b/utils/domoticz/Makefile @@ -22,7 +22,7 @@ PKG_BUILD_DEPENDS:=python3 minizip cereal PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/domoticz SECTION:=utils diff --git a/utils/ecdsautils/Makefile b/utils/ecdsautils/Makefile index 2d2005b90d..e6f5a916e6 100644 --- a/utils/ecdsautils/Makefile +++ b/utils/ecdsautils/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYRIGHT CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libecdsautil SECTION:=libs diff --git a/utils/fish/Makefile b/utils/fish/Makefile index 56b9a77621..455674dbf2 100644 --- a/utils/fish/Makefile +++ b/utils/fish/Makefile @@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:fishshell:fish include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/fish SECTION:=utils diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile index 5ae8472a35..300339aee9 100644 --- a/utils/gammu/Makefile +++ b/utils/gammu/Makefile @@ -24,7 +24,7 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/gammu SECTION:=utils diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 40919abe62..a243b740b9 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -167,7 +167,7 @@ MARIADB_SERVER_EXTRA := \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk MARIADB_COMMON_DEPENDS := \ $(ICONV_DEPENDS) \ diff --git a/utils/netwhere/Makefile b/utils/netwhere/Makefile index 2258f22420..1de3a82a91 100644 --- a/utils/netwhere/Makefile +++ b/utils/netwhere/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=boost include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/netwhere SECTION:=utils diff --git a/utils/openobex/Makefile b/utils/openobex/Makefile index 8d4ccecd1e..12daef1d24 100644 --- a/utils/openobex/Makefile +++ b/utils/openobex/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:openobex:openobex include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/openobex/Default TITLE:=Open Source impl of the OBject EXchange protocol diff --git a/utils/rpcd-mod-lxc/Makefile b/utils/rpcd-mod-lxc/Makefile index 3448d7c155..289b2d1241 100644 --- a/utils/rpcd-mod-lxc/Makefile +++ b/utils/rpcd-mod-lxc/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE:=ISC PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/rpcd-mod-lxc SECTION:=libs diff --git a/utils/rtl-sdr/Makefile b/utils/rtl-sdr/Makefile index 2beaf877e2..8237d4a12c 100644 --- a/utils/rtl-sdr/Makefile +++ b/utils/rtl-sdr/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Vasilis Tsiligiannis include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/rtl-sdr/Default TITLE:=Software Defined Radio with Realtek RTL2832U diff --git a/utils/rtl_433/Makefile b/utils/rtl_433/Makefile index fe08c450f1..cf3e442499 100644 --- a/utils/rtl_433/Makefile +++ b/utils/rtl_433/Makefile @@ -19,7 +19,7 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/rtl_433 TITLE:=Realtek RTL2832 based 433.92MHz generic data receiver diff --git a/utils/rtty/Makefile b/utils/rtty/Makefile index 65bf9a3dc7..f1443dca5f 100644 --- a/utils/rtty/Makefile +++ b/utils/rtty/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/rtty/Default TITLE:=Access your terminals from anywhere via the web diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile index ab1112eb0a..0c4c34431a 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/sumo SECTION:=utils diff --git a/utils/taskwarrior/Makefile b/utils/taskwarrior/Makefile index 5e639e3ddd..611b350b72 100644 --- a/utils/taskwarrior/Makefile +++ b/utils/taskwarrior/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/taskwarrior TITLE:=taskwarrior diff --git a/utils/telldus-core/Makefile b/utils/telldus-core/Makefile index 931ac06935..96d7dfc64e 100644 --- a/utils/telldus-core/Makefile +++ b/utils/telldus-core/Makefile @@ -21,7 +21,7 @@ CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=argp-standalone include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/telldus-core SECTION:=utils diff --git a/utils/tesseract/Makefile b/utils/tesseract/Makefile index 8911bf65c8..328998df67 100644 --- a/utils/tesseract/Makefile +++ b/utils/tesseract/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_BINARY_SUBDIR:=openwrt-build include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/tesseract MENU:=1 diff --git a/utils/tini/Makefile b/utils/tini/Makefile index 2f09b26608..a122ec2558 100644 --- a/utils/tini/Makefile +++ b/utils/tini/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/tini SECTION:=utils diff --git a/utils/ttyd/Makefile b/utils/ttyd/Makefile index 947b62ed1c..eb253fd222 100644 --- a/utils/ttyd/Makefile +++ b/utils/ttyd/Makefile @@ -20,7 +20,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/ttyd SECTION:=utils diff --git a/utils/uledd/Makefile b/utils/uledd/Makefile index 1b5b7567a6..cbed552eac 100644 --- a/utils/uledd/Makefile +++ b/utils/uledd/Makefile @@ -14,7 +14,7 @@ PKG_LICENSE:=LGPL-2.1-only PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/uledd SECTION:=utils diff --git a/utils/uvcdynctrl/Makefile b/utils/uvcdynctrl/Makefile index e3590f2362..eb569b931d 100644 --- a/utils/uvcdynctrl/Makefile +++ b/utils/uvcdynctrl/Makefile @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=uvcdynctrl/COPYING include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../../devel/ninja/ninja-cmake.mk +include $(INCLUDE_DIR)/cmake.mk define Package/uvcdynctrl SECTION:=utils -- 2.30.2