projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swconfig: use libnl-tiny instead of libnl
[openwrt-10.03/.git]
/
package
/
swconfig
/
Makefile
diff --git
a/package/swconfig/Makefile
b/package/swconfig/Makefile
index 5959ef4c8c76b97c3de55fd83f3778c8bcdb00e0..fcabf83b5922acb8c3bf84a2aa18a5630b291a92 100644
(file)
--- a/
package/swconfig/Makefile
+++ b/
package/swconfig/Makefile
@@
-6,24
+6,25
@@
#
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||LINUX_2_6_28||LINUX_2_6_29 +libuci
+ 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 += \
+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)
@@
-31,10
+32,10
@@
define Build/Prepare
endef
define Build/Compile
endef
define Build/Compile
- CFLAGS="$(TARGET_C
FLAGS) $(TARGET_CPP
FLAGS)" \
+ CFLAGS="$(TARGET_C
PPFLAGS) $(TARGET_C
FLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- LIBS="
-L$(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/lib/libnl.a
-lm -luci"
+ LIBS="
$(TARGET_LDFLAGS) -lnl-tiny
-lm -luci"
endef
define Package/swconfig/install
endef
define Package/swconfig/install