diff options
author | James E. King III <jking@apache.org> | 2019-01-24 17:45:07 -0500 |
---|---|---|
committer | James E. King III <jking@apache.org> | 2019-01-25 23:33:54 -0500 |
commit | b96c43892a9e89dfa61834505bb25357e80287da (patch) | |
tree | 02bbf30d80e6f6ef8c76bc67ad20b90331b6de9d /tutorial | |
parent | 8935c98046dbbdd36ede73c1525f1be9df8da5cd (diff) | |
download | thrift-b96c43892a9e89dfa61834505bb25357e80287da.tar.gz |
THRIFT-4717: fix up make clean with autoconf
Diffstat (limited to 'tutorial')
-rw-r--r-- | tutorial/d/Makefile.am | 7 | ||||
-rw-r--r-- | tutorial/dart/Makefile.am | 10 | ||||
-rwxr-xr-x | tutorial/hs/Makefile.am | 7 | ||||
-rw-r--r-- | tutorial/netcore/Makefile.am | 9 |
4 files changed, 31 insertions, 2 deletions
diff --git a/tutorial/d/Makefile.am b/tutorial/d/Makefile.am index d8c8b2910..358294ce5 100644 --- a/tutorial/d/Makefile.am +++ b/tutorial/d/Makefile.am @@ -44,3 +44,10 @@ all-local: $(PROGS) clean: $(RM) -f $(PROGS) + $(RM) -r gen-d/ + find . -type f -name '*.o' | xargs rm -f + +dist-hook: + $(RM) -f $(distdir)/$(PROGS) + $(RM) -r $(distdir)/gen-d/ + find $(destdir) -type f -name '*.o' | xargs rm -f diff --git a/tutorial/dart/Makefile.am b/tutorial/dart/Makefile.am index 0495aca60..0b93ac859 100644 --- a/tutorial/dart/Makefile.am +++ b/tutorial/dart/Makefile.am @@ -25,11 +25,19 @@ gen-dart/tutorial/lib/tutorial.dart gen-dart/shared/lib/shared.dart: $(top_srcdi all-local: gen-dart/tutorial/lib/tutorial.dart pub-get clean-local: - $(RM) -r gen-* + $(RM) -r gen-*/ + find . -type d -name ".dart_tool" | xargs $(RM) -r find . -type d -name "packages" | xargs $(RM) -r find . -type f -name ".packages" | xargs $(RM) find . -type f -name "pubspec.lock" | xargs $(RM) +dist-hook: + $(RM) -r $(distdir)/gen-*/ + find $(distdir) -type d -name ".dart_tool" | xargs $(RM) -r + find $(distdir) -type d -name "packages" | xargs $(RM) -r + find $(distdir) -type f -name ".packages" | xargs $(RM) + find $(distdir) -type f -name "pubspec.lock" | xargs $(RM) + pub-get: pub-get-gen pub-get-client pub-get-console-client pub-get-server pub-get-gen: pub-get-tutorial pub-get-shared diff --git a/tutorial/hs/Makefile.am b/tutorial/hs/Makefile.am index a3eccc2b1..9c6fd8308 100755 --- a/tutorial/hs/Makefile.am +++ b/tutorial/hs/Makefile.am @@ -27,7 +27,12 @@ install-exec-hook: # Make sure this doesn't fail if Haskell is not configured. clean-local: $(CABAL) clean - $(RM) -r gen-* + $(RM) -r dist/ + $(RM) -r gen-*/ + +dist-hook: + $(RM) -r $(distdir)/dist/ + $(RM) -r $(distdir)/gen-*/ check-local: $(CABAL) check diff --git a/tutorial/netcore/Makefile.am b/tutorial/netcore/Makefile.am index e30555655..bd19dfe6a 100644 --- a/tutorial/netcore/Makefile.am +++ b/tutorial/netcore/Makefile.am @@ -31,6 +31,15 @@ clean-local: $(RM) -r Interfaces/bin $(RM) -r Interfaces/obj +dist-hook: + $(RM) $(distdir)/Interfaces.dll + $(RM) -r $(distdir)/Client/bin + $(RM) -r $(distdir)/Client/obj + $(RM) -r $(distdir)/Server/bin + $(RM) -r $(distdir)/Server/obj + $(RM) -r $(distdir)/Interfaces/bin + $(RM) -r $(distdir)/Interfaces/obj + EXTRA_DIST = \ Client \ Interfaces \ |