X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fswconfig%2FMakefile;h=d22fa628f910dff0cc8ea243735524bb530bdcf9;hp=0d86438a792533b6b98c3de55a3b127969ad0133;hb=1a8f0fd9f0dc87ffd83e55176299a98f47c3cefb;hpb=a662d5b130a558956875dbe259c551b632abb0f4

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 0d86438a7..d22fa628f 100644
--- 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.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=kmod-swconfig
+PKG_NAME:=swconfig
 PKG_RELEASE:=1
-PKG_BUILD_DEPENDS:=libnl
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 define Package/swconfig
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@LINUX_2_6_26||LINUX_2_6_27
+  DEPENDS:=@LINUX_2_6 +libuci +libnl-tiny
   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$(PKG_BUILD_DIR)
+	-I$(PKG_BUILD_DIR) \
+	$(TARGET_CPPFLAGS)
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
@@ -33,15 +32,16 @@ define Build/Prepare
 endef
 
 define Build/Compile
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
 	$(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
-	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/bin $(1)/lib/network
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/bin/swconfig
+	$(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/
 endef
 
 $(eval $(call BuildPackage,swconfig))