aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-12-13 13:15:05 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-14 12:13:13 +0100
commite82c8d6e20ab34f61621ec9ab7d16959d268124d (patch)
tree9465f7779a6c06e09ae83c7f437ca428603391c2
parente175a4d4f1b4dde21ae953d7a32e2b6882831417 (diff)
downloadupstream-e82c8d6e20ab34f61621ec9ab7d16959d268124d.tar.gz
upstream-e82c8d6e20ab34f61621ec9ab7d16959d268124d.tar.bz2
upstream-e82c8d6e20ab34f61621ec9ab7d16959d268124d.zip
swconfig: replace the shared library with a static one
Reduces binary size Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/config/swconfig/Makefile3
-rw-r--r--package/network/config/swconfig/src/Makefile7
2 files changed, 5 insertions, 5 deletions
diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile
index d1c8fd7b5e..e4a00d6d63 100644
--- a/package/network/config/swconfig/Makefile
+++ b/package/network/config/swconfig/Makefile
@@ -42,13 +42,12 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/swlib.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_BUILD_DIR)/libsw.so $(1)/usr/lib/
+ $(CP) $(PKG_BUILD_DIR)/libsw.a $(1)/usr/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 1176bf0e40..e972a44397 100644
--- a/package/network/config/swconfig/src/Makefile
+++ b/package/network/config/swconfig/src/Makefile
@@ -8,8 +8,9 @@ all: swconfig
%.o: %.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $^
-libsw.so: swlib.o
- $(CC) $(CFLAGS) -fPIC -shared -o $@ swlib.o
+libsw.a: swlib.o
+ $(AR) rcu $@ swlib.o
+ $(RANLIB) $@
-swconfig: libsw.so cli.o uci.o
+swconfig: libsw.a cli.o uci.o
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -L./ -lsw