From c71ef0499bba0564682064098e26422ac280b06b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 14 Jul 2015 09:56:59 +0000 Subject: [PATCH] swconfig: Split libsw out of swconfig for reuse in other packages Signed-off-by: Helmut Schaa Signed-off-by: Helmut Schaa SVN-Revision: 46358 --- package/network/config/swconfig/Makefile | 9 +++++++++ package/network/config/swconfig/src/Makefile | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile index 7d0f30e7bb..3c2ec3e387 100644 --- a/package/network/config/swconfig/Makefile +++ b/package/network/config/swconfig/Makefile @@ -42,9 +42,18 @@ define Build/Compile LIBS="$(TARGET_LDFLAGS) -lnl-tiny -lm -luci" endef +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/swlib.h $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/lib + $(CP) $(PKG_BUILD_DIR)/libsw.so $(1)/lib/ +endef + define Package/swconfig/install $(INSTALL_DIR) $(1)/sbin $(1)/lib/network $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/sbin/swconfig + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libsw.so $(1)/lib $(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/ endef diff --git a/package/network/config/swconfig/src/Makefile b/package/network/config/swconfig/src/Makefile index 0d56f43156..1176bf0e40 100644 --- a/package/network/config/swconfig/src/Makefile +++ b/package/network/config/swconfig/src/Makefile @@ -6,7 +6,10 @@ LIBS=-lnl -lnl-genl all: swconfig %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $^ + $(CC) $(CFLAGS) -fPIC -c -o $@ $^ -swconfig: cli.o swlib.o uci.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +libsw.so: swlib.o + $(CC) $(CFLAGS) -fPIC -shared -o $@ swlib.o + +swconfig: libsw.so cli.o uci.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -L./ -lsw -- 2.25.1