Author: nbd Date: 2014-12-14 00:58:35 +0100 (Sun, 14 Dec 2014) New Revision: 43698
Modified: trunk/package/utils/nvram/Makefile trunk/package/utils/nvram/src/Makefile Log: nvram: remove libnvram.so, it is unused and incompatible to the broadcom API anyway Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/utils/nvram/Makefile =================================================================== --- trunk/package/utils/nvram/Makefile 2014-12-13 22:12:36 UTC (rev 43697) +++ trunk/package/utils/nvram/Makefile 2014-12-13 23:58:35 UTC (rev 43698) @@ -42,19 +42,11 @@ 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)) Modified: trunk/package/utils/nvram/src/Makefile =================================================================== --- trunk/package/utils/nvram/src/Makefile 2014-12-13 22:12:36 UTC (rev 43697) +++ trunk/package/utils/nvram/src/Makefile 2014-12-13 23:58:35 UTC (rev 43698) @@ -1,33 +1,7 @@ -CLI_FILENAME = nvram +all: nvram -LIB_VERMAJOR = 0 -LIB_VERMINOR = 1 -LIB_FILENAME = libnvram.so +nvram: + $(CC) $(CFLAGS) -o $@ cli.c crc.c nvram.c $(LDFLAGS) -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) - clean: - rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o + rm -f nvram _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
