commit 48a19be94a175a8580308033cbd69d88e167a2dc Author: Ximin Luo infinity0@gmx.com Date: Mon Oct 21 18:38:42 2013 +0100
get rid of dist in Makefile.client, it's not needed and causes problems in the PTBB - DISTNAME is propagated from Makefile, which in PTBB is set to "flashproxy-client" - This results in a cyclic dependency since $(DISTNAME) depends on $(SRC_ALL) which includes flashproxy-client, the file --- Makefile.client | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/Makefile.client b/Makefile.client index 5aec18a..ba7f733 100644 --- a/Makefile.client +++ b/Makefile.client @@ -5,7 +5,6 @@
PACKAGE = flashproxy-client VERSION = 1.3 -DISTNAME = $(PACKAGE)-$(VERSION) DESTDIR =
THISFILE = $(lastword $(MAKEFILE_LIST)) @@ -72,27 +71,11 @@ clean: rm -f *.pyc
distclean: clean - rm -rf $(DISTNAME) - rm -f $(DISTNAME).tar.gz
maintainer-clean: distclean rm -f $(DST_MAN1)
-$(DISTNAME): $(SRC_ALL) $(TEST_ALL) $(THISFILE) - mkdir -p $@ - cp --parents -t "$@" $^ - -$(DISTNAME).tar.gz: $(DISTNAME) - tar czf "$@" "$<" - -# we never actually use this target, but it is given for completeness, in case -# distro packagers want to do something with a client-only source tarball -dist: force-dist $(DISTNAME).tar.gz - check: $(THISFILE) for i in $(TEST_PY); do $(PYTHON) "$$i"; done
-force-dist: - rm -rf $(DISTNAME) $(DISTNAME).tar.gz - -.PHONY: all install uninstall clean distclean maintainer-clean dist check force-dist +.PHONY: all install uninstall clean distclean maintainer-clean dist check