X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/51a182a864efe986da327fc07a1e4a12dadd8ed3..e211311b517b1e6d75ff70cf593c0b65bfdf239d:/package/wprobe/Makefile diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index bbc2b88c9..fe96512e2 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -10,15 +10,13 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wprobe PKG_VERSION:=1 -PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix +PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix -include $(INCLUDE_DIR)/package.mk - -PKG_CONFDEPS = \ +PKG_CONFIG_DEPENDS = \ CONFIG_PACKAGE_kmod-wprobe \ - CONFIG_PACKAGE_wprobe-export + CONFIG_PACKAGE_wprobe-export \ -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) +include $(INCLUDE_DIR)/package.mk define KernelPackage/wprobe SUBMENU:=Network Support @@ -35,7 +33,7 @@ endef define Package/wprobe-info SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+kmod-wprobe +libnl-tiny TITLE:=Wireless measurement utility endef @@ -47,7 +45,7 @@ endef define Package/wprobe-export SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+kmod-wprobe +libnl-tiny TITLE:=Wireless measurement data exporter endef @@ -61,7 +59,9 @@ define Build/Prepare $(CP) src/* $(PKG_BUILD_DIR)/ endef -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include +TARGET_CPPFLAGS := \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + $(TARGET_CPPFLAGS) ifdef CONFIG_PACKAGE_kmod-wprobe define Build/Compile/kmod @@ -82,7 +82,7 @@ define Build/Compile/lib CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBNL="$(STAGING_DIR)/usr/lib/libnl.a" + LIBNL="-lnl-tiny" endef ifdef CONFIG_PACKAGE_wprobe-export @@ -92,7 +92,7 @@ ifdef CONFIG_PACKAGE_wprobe-export CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a $(STAGING_DIR)/usr/lib/libnl.a -lm" + LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a -lnl-tiny -lm" endef endif