From 4fba88b87b0e46c76bdc0757e60010affa09f9d0 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 11 Jun 2005 21:13:46 +0000 Subject: [PATCH] fix wificonf build depends git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1204 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/Makefile | 1 + openwrt/package/openwrt/libnvram/Makefile | 6 ++++-- openwrt/package/openwrt/libshared/Makefile | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 4fbcf83ca..f9768de47 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -127,6 +127,7 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) compile: $(patsubst %,%-compile,$(package-y) $(package-m)) install: $(patsubst %,%-install,$(package-y)) +wificonf-compile: openwrt-compile wireless-tools-compile arpwatch-compile: libpcap-compile cyrus-sasl-compile: openssl-compile dropbear-compile: zlib-compile diff --git a/openwrt/package/openwrt/libnvram/Makefile b/openwrt/package/openwrt/libnvram/Makefile index 75a1afcd6..a5b62848b 100644 --- a/openwrt/package/openwrt/libnvram/Makefile +++ b/openwrt/package/openwrt/libnvram/Makefile @@ -26,10 +26,12 @@ $(PKG_BUILD_DIR)/nvram: $(PKG_BUILD_DIR)/main.o $(PKG_BUILD_DIR)/libnvram.so $(PKG_BUILD_DIR)/libnvram.so: $(LIBNVRAM_OBJS) $(TARGET_CC) -shared -o $@ $^ + +$(STAGING_DIR)/lib/libnvram.so: $(PKG_BUILD_DIR)/libnvram.so + install -m 644 $< $@ $(TARGET_DIR)/usr/lib/libnvram.so: $(PKG_BUILD_DIR)/libnvram.so install -m 644 $< $@ - install -m 644 $< $(STAGING_DIR)/lib/libnvram.so $(STRIP) $@ $(TARGET_DIR)/usr/sbin/nvram: $(PKG_BUILD_DIR)/nvram @@ -37,7 +39,7 @@ $(TARGET_DIR)/usr/sbin/nvram: $(PKG_BUILD_DIR)/nvram install -m 755 $< $@ $(STRIP) $@ -compile: $(PKG_BUILD_DIR)/libnvram.so $(PKG_BUILD_DIR)/nvram +compile: $(PKG_BUILD_DIR)/libnvram.so $(STAGING_DIR)/lib/libnvram.so $(PKG_BUILD_DIR)/nvram install: $(TARGET_DIR)/usr/lib/libnvram.so $(TARGET_DIR)/usr/sbin/nvram clean: diff --git a/openwrt/package/openwrt/libshared/Makefile b/openwrt/package/openwrt/libshared/Makefile index 601dc665c..4309c8ce6 100644 --- a/openwrt/package/openwrt/libshared/Makefile +++ b/openwrt/package/openwrt/libshared/Makefile @@ -26,12 +26,14 @@ $(PKG_BUILD_DIR): $(PKG_BUILD_DIR)/libshared.so: $(LIBSHARED_OBJS) $(TARGET_CC) -shared -o $@ $^ +$(STAGING_DIR)/lib/libshared.so: $(PKG_BUILD_DIR)/libshared.so + install -m 644 $< $@ + $(TARGET_DIR)/usr/lib/libshared.so: $(PKG_BUILD_DIR)/libshared.so install -m 644 $^ $@ - install -m 644 $^ $(STAGING_DIR)/lib/libshared.so $(STRIP) $@ -compile: $(PKG_BUILD_DIR)/libshared.so +compile: $(PKG_BUILD_DIR)/libshared.so $(STAGING_DIR)/lib/libshared.so install: $(TARGET_DIR)/usr/lib/libshared.so clean: -- 2.20.1