Quantcast

[Arpack-ng] [PATCH] Don't install test binaries.

classic Classic list List threaded Threaded
2 messages Options
rudimeier rudimeier
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[Arpack-ng] [PATCH] Don't install test binaries.

From: Ruediger Meier <[hidden email]>


Signed-off-by: Ruediger Meier <[hidden email]>
---
 TESTS/Makefile.am |    2 +-
 TESTS/Makefile.in |   83 ++++++++++++----------------------------------------
 2 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/TESTS/Makefile.am b/TESTS/Makefile.am
index 09cfd38..16ba162 100644
--- a/TESTS/Makefile.am
+++ b/TESTS/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = dnsimp  bug_1323
+check_PROGRAMS = dnsimp  bug_1323
 
 dnsimp_SOURCES = dnsimp.f mmio.f debug.h
 
diff --git a/TESTS/Makefile.in b/TESTS/Makefile.in
index 67ed70d..d6aba51 100644
--- a/TESTS/Makefile.in
+++ b/TESTS/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -78,7 +77,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
+check_PROGRAMS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
 TESTS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
 subdir = TESTS
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -94,8 +93,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
 am_bug_1323_OBJECTS = bug_1323.$(OBJEXT)
 bug_1323_OBJECTS = $(am_bug_1323_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -549,49 +546,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
-  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- || test -f $$p1 \
-  ; then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' \
-    -e 's|.*|.|' \
-    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-    else { print "f", $$3 "/" $$4, $$1; } } \
-  END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
-    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-    test -z "$$files" || { \
-    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-    } \
- ; done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
-  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-      -e 's/$$/$(EXEEXT)/' \
- `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
  echo " rm -f" $$list; \
  rm -f $$list || exit $$?; \
  test -n "$(EXEEXT)" || exit 0; \
@@ -810,7 +767,7 @@ check-TESTS:
  log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
  $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
  exit $$?;
-recheck: all
+recheck: all $(check_PROGRAMS)
  @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
  @set +e; $(am__set_TESTS_bases); \
  bases=`for i in $$bases; do echo $$i; done \
@@ -881,13 +838,11 @@ distdir: $(DISTFILES)
   fi; \
  done
 check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
  $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile
 installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
-  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -923,7 +878,8 @@ maintainer-clean-generic:
  @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+ mostlyclean-am
 
 distclean: distclean-am
  -rm -f Makefile
@@ -948,7 +904,7 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-html: install-html-am
 
@@ -987,24 +943,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
  ctags ctags-am distclean distclean-compile distclean-generic \
  distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
  maintainer-clean-generic mostlyclean mostlyclean-compile \
  mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- recheck tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS
+ recheck tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--
1.7.6.1

_______________________________________________
Arpack-ng mailing list
[hidden email]
http://lists.scilab.org/mailman/listinfo/arpack-ng
Sylvestre Ledru-4 Sylvestre Ledru-4
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] Don't install test binaries.

Right. Pushed here:
http://forge.scilab.org/index.php/p/arpack-ng/source/commit/e90e4f65c4ce043dbe002566392ba92594eaecce/

Thanks,
S

Le 10/12/2013 13:41, Ruediger Meier a écrit :

> From: Ruediger Meier <[hidden email]>
>
>
> Signed-off-by: Ruediger Meier <[hidden email]>
> ---
>  TESTS/Makefile.am |    2 +-
>  TESTS/Makefile.in |   83 ++++++++++++----------------------------------------
>  2 files changed, 20 insertions(+), 65 deletions(-)
>
> diff --git a/TESTS/Makefile.am b/TESTS/Makefile.am
> index 09cfd38..16ba162 100644
> --- a/TESTS/Makefile.am
> +++ b/TESTS/Makefile.am
> @@ -1,4 +1,4 @@
> -bin_PROGRAMS = dnsimp  bug_1323
> +check_PROGRAMS = dnsimp  bug_1323
>  
>  dnsimp_SOURCES = dnsimp.f mmio.f debug.h
>  
> diff --git a/TESTS/Makefile.in b/TESTS/Makefile.in
> index 67ed70d..d6aba51 100644
> --- a/TESTS/Makefile.in
> +++ b/TESTS/Makefile.in
> @@ -13,7 +13,6 @@
>  # PARTICULAR PURPOSE.
>  
>  @SET_MAKE@
> -
>  VPATH = @srcdir@
>  am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
>  am__make_running_with_option = \
> @@ -78,7 +77,7 @@ PRE_UNINSTALL = :
>  POST_UNINSTALL = :
>  build_triplet = @build@
>  host_triplet = @host@
> -bin_PROGRAMS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
> +check_PROGRAMS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
>  TESTS = dnsimp$(EXEEXT) bug_1323$(EXEEXT)
>  subdir = TESTS
>  DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> @@ -94,8 +93,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>  mkinstalldirs = $(install_sh) -d
>  CONFIG_CLEAN_FILES =
>  CONFIG_CLEAN_VPATH_FILES =
> -am__installdirs = "$(DESTDIR)$(bindir)"
> -PROGRAMS = $(bin_PROGRAMS)
>  am_bug_1323_OBJECTS = bug_1323.$(OBJEXT)
>  bug_1323_OBJECTS = $(am_bug_1323_OBJECTS)
>  am__DEPENDENCIES_1 =
> @@ -549,49 +546,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
>  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
>   cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>  $(am__aclocal_m4_deps):
> -install-binPROGRAMS: $(bin_PROGRAMS)
> - @$(NORMAL_INSTALL)
> - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
> - if test -n "$$list"; then \
> -  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
> -  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
> - fi; \
> - for p in $$list; do echo "$$p $$p"; done | \
> - sed 's/$(EXEEXT)$$//' | \
> - while read p p1; do if test -f $$p \
> - || test -f $$p1 \
> -  ; then echo "$$p"; echo "$$p"; else :; fi; \
> - done | \
> - sed -e 'p;s,.*/,,;n;h' \
> -    -e 's|.*|.|' \
> -    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
> - sed 'N;N;N;s,\n, ,g' | \
> - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
> -  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
> -    if ($$2 == $$4) files[d] = files[d] " " $$1; \
> -    else { print "f", $$3 "/" $$4, $$1; } } \
> -  END { for (d in files) print "f", d, files[d] }' | \
> - while read type dir files; do \
> -    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
> -    test -z "$$files" || { \
> -    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
> -    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
> -    } \
> - ; done
> -
> -uninstall-binPROGRAMS:
> - @$(NORMAL_UNINSTALL)
> - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
> - files=`for p in $$list; do echo "$$p"; done | \
> -  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
> -      -e 's/$$/$(EXEEXT)/' \
> - `; \
> - test -n "$$list" || exit 0; \
> - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
> - cd "$(DESTDIR)$(bindir)" && rm -f $$files
> -
> -clean-binPROGRAMS:
> - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
> +
> +clean-checkPROGRAMS:
> + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
>   echo " rm -f" $$list; \
>   rm -f $$list || exit $$?; \
>   test -n "$(EXEEXT)" || exit 0; \
> @@ -810,7 +767,7 @@ check-TESTS:
>   log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
>   $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
>   exit $$?;
> -recheck: all
> +recheck: all $(check_PROGRAMS)
>   @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
>   @set +e; $(am__set_TESTS_bases); \
>   bases=`for i in $$bases; do echo $$i; done \
> @@ -881,13 +838,11 @@ distdir: $(DISTFILES)
>    fi; \
>   done
>  check-am: all-am
> + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
>   $(MAKE) $(AM_MAKEFLAGS) check-TESTS
>  check: check-am
> -all-am: Makefile $(PROGRAMS)
> +all-am: Makefile
>  installdirs:
> - for dir in "$(DESTDIR)$(bindir)"; do \
> -  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> - done
>  install: install-am
>  install-exec: install-exec-am
>  install-data: install-data-am
> @@ -923,7 +878,8 @@ maintainer-clean-generic:
>   @echo "it deletes files that may require special tools to rebuild."
>  clean: clean-am
>  
> -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
> +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
> + mostlyclean-am
>  
>  distclean: distclean-am
>   -rm -f Makefile
> @@ -948,7 +904,7 @@ install-dvi: install-dvi-am
>  
>  install-dvi-am:
>  
> -install-exec-am: install-binPROGRAMS
> +install-exec-am:
>  
>  install-html: install-html-am
>  
> @@ -987,24 +943,23 @@ ps: ps-am
>  
>  ps-am:
>  
> -uninstall-am: uninstall-binPROGRAMS
> +uninstall-am:
>  
>  .MAKE: check-am install-am install-strip
>  
>  .PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
> - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
> + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
>   ctags ctags-am distclean distclean-compile distclean-generic \
>   distclean-libtool distclean-tags distdir dvi dvi-am html \
> - html-am info info-am install install-am install-binPROGRAMS \
> - install-data install-data-am install-dvi install-dvi-am \
> - install-exec install-exec-am install-html install-html-am \
> - install-info install-info-am install-man install-pdf \
> - install-pdf-am install-ps install-ps-am install-strip \
> - installcheck installcheck-am installdirs maintainer-clean \
> + html-am info info-am install install-am install-data \
> + install-data-am install-dvi install-dvi-am install-exec \
> + install-exec-am install-html install-html-am install-info \
> + install-info-am install-man install-pdf install-pdf-am \
> + install-ps install-ps-am install-strip installcheck \
> + installcheck-am installdirs maintainer-clean \
>   maintainer-clean-generic mostlyclean mostlyclean-compile \
>   mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
> - recheck tags tags-am uninstall uninstall-am \
> - uninstall-binPROGRAMS
> + recheck tags tags-am uninstall uninstall-am
>  
>  
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
>

_______________________________________________
Arpack-ng mailing list
[hidden email]
http://lists.scilab.org/mailman/listinfo/arpack-ng
Loading...