summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.am10
-rw-r--r--c++/Makefile.in14
-rw-r--r--c++/examples/Makefile.am7
-rw-r--r--c++/examples/Makefile.in7
4 files changed, 16 insertions, 22 deletions
diff --git a/c++/Makefile.am b/c++/Makefile.am
index 042fb92..986aca4 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -25,16 +25,6 @@ if BUILD_CXX_CONDITIONAL
endif
DIST_SUBDIRS = src test examples
-# Clean and mostlyclean need to recurse into examples directory
-clean-local:
- @if test -f examples/Makefile; then \
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
- fi;
-mostlyclean-local:
- @if test -f examples/Makefile; then \
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
- fi;
-
# Install examples
install-examples uninstall-examples:
@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
diff --git a/c++/Makefile.in b/c++/Makefile.in
index e8cf00f..06f978a 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -553,7 +553,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -603,7 +603,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
check-TESTS check-am clean clean-generic clean-libtool \
- clean-local clean-recursive ctags ctags-recursive distclean \
+ clean-recursive ctags ctags-recursive distclean \
distclean-generic distclean-libtool distclean-recursive \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
@@ -622,16 +622,6 @@ uninstall-info: uninstall-info-recursive
# as well.
check-install: installcheck
-# Clean and mostlyclean need to recurse into examples directory
-clean-local:
- @if test -f examples/Makefile; then \
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
- fi;
-mostlyclean-local:
- @if test -f examples/Makefile; then \
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
- fi;
-
# Install examples
install-examples uninstall-examples:
@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 995964b..d729521 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -61,6 +61,13 @@ install-data-local:
uninstall-local:
@$(MAKE) uninstall-examples
+# Some C++ compilers/linkers will create a directory named ii_files,
+# which should be cleaned.
+mostlyclean-local:
+ if test -d ii_files; then \
+ $(RM) -rf ii_files; \
+ fi
+
# Install source files, which are the examples with .cpp suffixes. Do the same
# for uninstall.
install-examples: $(EXAMPLEDIR)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 56092e6..f146c56 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -507,6 +507,13 @@ install-data-local:
uninstall-local:
@$(MAKE) uninstall-examples
+# Some C++ compilers/linkers will create a directory named ii_files,
+# which should be cleaned.
+mostlyclean-local:
+ if test -d ii_files; then \
+ $(RM) -rf ii_files; \
+ fi
+
# Install source files, which are the examples with .cpp suffixes. Do the same
# for uninstall.
install-examples: $(EXAMPLEDIR)