Remove superfluous dependencies,

Add mostlyclean target


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1252 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 25 insertions, 10 deletions

diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 8716448ec..c2be8af4e 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -51,7 +51,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 	);
 	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -59,7 +59,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		all install
 	touch $@
 
-$(IPKG_LIBGCRYPT): $(STAGING_DIR)/usr/lib/libgcrypt.so
+$(IPKG_LIBGCRYPT):
 	install -m0755 -d $(IDIR_LIBGCRYPT)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBGCRYPT)
@@ -86,4 +86,9 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/share/aclocal/libgcrypt.m4 \
 
 compile: install-dev
+
 clean: uninstall-dev
+
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index cb16853a0..adb144701 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 	);
 	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		all install
 	touch $@
 
-$(IPKG_LIBGPG_ERROR): $(STAGING_DIR)/usr/lib/libgpg-error.so
+$(IPKG_LIBGPG_ERROR):
 	install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBGPG_ERROR)
@@ -85,4 +85,9 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/share/aclocal/gpg-error.m4 \
 
 compile: install-dev
+
 clean: uninstall-dev
+
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile
index e091ca6f9..baca64cbe 100644
--- a/package/opencdk/Makefile
+++ b/package/opencdk/Makefile
@@ -22,9 +22,9 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBOPENCDK,libopencdk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		touch configure.ec ; \
+		touch configure.ac ; \
 		touch acinclude.m4 ; \
 		touch aclocal.m4 ; \
 		touch Makefile.in ; \
@@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 	);
 	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -69,7 +69,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		all install
 	touch $@
 
-$(IPKG_LIBOPENCDK): $(STAGING_DIR)/usr/lib/libopencdk.so
+$(IPKG_LIBOPENCDK):
 	install -m0755 -d $(IDIR_LIBOPENCDK)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBOPENCDK)
@@ -93,4 +93,9 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/lib/opencdk.{a,so*} \
 
 compile: install-dev
+
 clean: uninstall-dev
+
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built