From 15a7a3792e6b130f6a354305133d28ab9d3778e2 Mon Sep 17 00:00:00 2001 From: Inaky Perez-Gonzalez Date: Tue, 21 Apr 2009 15:38:58 -0700 Subject: tests: install in $pkgdir/tests Signed-off-by: Inaky Perez-Gonzalez --- src/Makefile.am | 7 ++++--- src/Makefile.in | 52 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7ac8b02..65d1652 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,12 @@ - INCLUDES = \ -I$(top_builddir)/include -I$(top_srcdir)/include \ $(I2400M_INCLUDES) LDADD = ../lib/libwimaxll.la $(LIBNL1_LIBS) -noinst_PROGRAMS = \ - test-dump-pipe \ +testdir = $(pkglibdir)/test + +test_PROGRAMS = \ + test-dump-pipe \ test-rfkill diff --git a/src/Makefile.in b/src/Makefile.in index 73bc37d..ef7e9a0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,7 +32,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = test-dump-pipe$(EXEEXT) test-rfkill$(EXEEXT) +test_PROGRAMS = test-dump-pipe$(EXEEXT) test-rfkill$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -42,7 +42,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = -PROGRAMS = $(noinst_PROGRAMS) +am__installdirs = "$(DESTDIR)$(testdir)" +testPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(test_PROGRAMS) test_dump_pipe_SOURCES = test-dump-pipe.c test_dump_pipe_OBJECTS = test-dump-pipe.$(OBJEXT) test_dump_pipe_LDADD = $(LDADD) @@ -194,6 +196,7 @@ INCLUDES = \ $(I2400M_INCLUDES) LDADD = ../lib/libwimaxll.la $(LIBNL1_LIBS) +testdir = $(pkglibdir)/test all: all-am .SUFFIXES: @@ -227,9 +230,30 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-testPROGRAMS: $(test_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)" + @list='$(test_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(testdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(testdir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-testPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(test_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \ + rm -f "$(DESTDIR)$(testdir)/$$f"; \ + done -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +clean-testPROGRAMS: + @list='$(test_PROGRAMS)'; for p in $$list; do \ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ @@ -354,6 +378,9 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) installdirs: + for dir in "$(DESTDIR)$(testdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -380,7 +407,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ +clean-am: clean-generic clean-libtool clean-testPROGRAMS \ mostlyclean-am distclean: distclean-am @@ -399,7 +426,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-testPROGRAMS install-dvi: install-dvi-am @@ -435,22 +462,23 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-testPROGRAMS .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ + clean-libtool clean-testPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html 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 tags uninstall uninstall-am + install-strip install-testPROGRAMS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-testPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- cgit v1.2.3