aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-13 23:58:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-13 23:58:35 +0000
commit0f51d48c0edd68b6155ea952adb06213cabb069b (patch)
tree346fe8901098292404ba2d59f0232b4a7cb37c6e
parent2b4fbeb6d4f77fe3cb441a36f26a577166df381a (diff)
downloadupstream-0f51d48c0edd68b6155ea952adb06213cabb069b.tar.gz
upstream-0f51d48c0edd68b6155ea952adb06213cabb069b.tar.bz2
upstream-0f51d48c0edd68b6155ea952adb06213cabb069b.zip
nvram: remove libnvram.so, it is unused and incompatible to the broadcom API anyway
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43698
-rw-r--r--package/utils/nvram/Makefile8
-rw-r--r--package/utils/nvram/src/Makefile34
2 files changed, 4 insertions, 38 deletions
diff --git a/package/utils/nvram/Makefile b/package/utils/nvram/Makefile
index fe70e34669..992f3366ba 100644
--- a/package/utils/nvram/Makefile
+++ b/package/utils/nvram/Makefile
@@ -42,19 +42,11 @@ define Build/Compile
LDFLAGS="$(TARGET_LDFLAGS)"
endef
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/lib
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
- ln -s libnvram.so.0.1 $(1)/usr/lib/libnvram.so
-endef
-
define Package/nvram/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
- $(INSTALL_DIR) $(1)/usr/lib
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
endef
$(eval $(call BuildPackage,nvram))
diff --git a/package/utils/nvram/src/Makefile b/package/utils/nvram/src/Makefile
index 4872728baf..68a6354c00 100644
--- a/package/utils/nvram/src/Makefile
+++ b/package/utils/nvram/src/Makefile
@@ -1,33 +1,7 @@
-CLI_FILENAME = nvram
+all: nvram
-LIB_VERMAJOR = 0
-LIB_VERMINOR = 1
-LIB_FILENAME = libnvram.so
-
-LIB_CFLAGS = $(CFLAGS) -shared -fPIC
-LIB_LDFLAGS = $(LDFLAGS) -Wl,-soname,$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
-
-CLI_CFLAGS = $(CFLAGS)
-CLI_LDFLAGS = $(LDFLAGS)
-
-CLI_OBJ = cli.o
-LIB_OBJ = crc.o nvram.o
-
-all: cli libnvram
-
-cli: libnvram
- $(CC) $(CLI_CFLAGS) -c -o cli.o cli.c
- $(CC) -o $(CLI_FILENAME) $(CLI_LDFLAGS) $(CLI_OBJ) \
- $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
-
-cli.o: cli.c
- $(CC) $(CLI_CFLAGS) -c -o $@ $<
-
-libnvram:
- $(CC) $(LIB_CFLAGS) -c -o crc.o crc.c
- $(CC) $(LIB_CFLAGS) -c -o nvram.o nvram.c
- $(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) \
- -o $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR) $(LIB_OBJ)
+nvram:
+ $(CC) $(CFLAGS) -o $@ cli.c crc.c nvram.c $(LDFLAGS)
clean:
- rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o
+ rm -f nvram