stop build when an error occurs and when BUILDLOG is set (#5160)

[openwrt.git] / package / swconfig / Makefile

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 0d86438..fcabf83 100644 (file)
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -4,28 +4,27 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 

-PKG_NAME:=kmod-swconfig
+PKG_NAME:=swconfig

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_BUILD_DEPENDS:=libnl

 
 include $(INCLUDE_DIR)/package.mk
 
 include $(INCLUDE_DIR)/package.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
 
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system

-  DEPENDS:=@LINUX_2_6_26||LINUX_2_6_27
+  DEPENDS:=@LINUX_2_6_26||LINUX_2_6_27||LINUX_2_6_28||LINUX_2_6_29 +libuci +libnl-tiny

   TITLE:=Switch configuration utility
 endef
 
   TITLE:=Switch configuration utility
 endef
 

-TARGET_CPPFLAGS += \
-       -I$(STAGING_DIR)/usr/include \
+TARGET_CPPFLAGS := \
+       -I$(STAGING_DIR)/usr/include/libnl-tiny \

        -I$(LINUX_DIR)/include \
        -I$(LINUX_DIR)/include \

-       -I$(PKG_BUILD_DIR)
+       -I$(PKG_BUILD_DIR) \
+       $(TARGET_CPPFLAGS)

 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)


@@ -33,15 +32,16 @@ define Build/Prepare
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+       CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               LIBS="$(STAGING_DIR)/usr/lib/libnl.a -lm"
+               LIBS="$(TARGET_LDFLAGS) -lnl-tiny -lm -luci"

 endef
 
 define Package/swconfig/install
 endef
 
 define Package/swconfig/install

-       $(INSTALL_DIR) $(1)/bin
+       $(INSTALL_DIR) $(1)/bin $(1)/lib/network

        $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/bin/swconfig
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/bin/swconfig

+       $(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/

 endef
 
 $(eval $(call BuildPackage,swconfig))
 endef
 
 $(eval $(call BuildPackage,swconfig))