diff options
author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-01 03:24:38 -0600 |
---|---|---|
committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-01 03:24:38 -0600 |
commit | 6532fd66f7e9d82229a729dbe54305388402fcf5 (patch) | |
tree | 6ca101475738ac966910dbe3b231ba46abf2236b | |
parent | 9b003eb043da10c98953c813ed01b0005ce6b075 (diff) | |
download | mock-6532fd66f7e9d82229a729dbe54305388402fcf5.tar.gz mock-6532fd66f7e9d82229a729dbe54305388402fcf5.tar.xz mock-6532fd66f7e9d82229a729dbe54305388402fcf5.zip |
move build of daemontest into makefile.
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | Makefile.in | 57 |
2 files changed, 42 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 9c683fa..98a531a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,8 @@ DISTCLEANFILES=*~ EXTRA_DIST = bin_PROGRAMS= -EXTRA_PROGRAMS= +check_PROGRAMS= src/daemontest +#TESTS = docs/make_check.sh CLEANFILES += $(EXTRA_PROGRAMS) @@ -70,6 +71,7 @@ install-exec-hook: perl -p -i -e 's|^PKGDATADIR=.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ done +.PHONY: rpm srpm rpm: dist BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ diff --git a/Makefile.in b/Makefile.in index bfcadc7..e2c8600 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = src/mock$(EXEEXT) -EXTRA_PROGRAMS = +check_PROGRAMS = src/daemontest$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_libexec_SCRIPTS) \ $(dist_mocketc_DATA) $(pkgpython_PYTHON) $(plugins_PYTHON) \ @@ -62,7 +62,10 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(mocketcdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) +src_daemontest_SOURCES = src/daemontest.c am__dirstamp = $(am__leading_dot)dirstamp +src_daemontest_OBJECTS = src/daemontest.$(OBJEXT) +src_daemontest_LDADD = $(LDADD) am_src_mock_OBJECTS = src/mock.$(OBJEXT) src_mock_OBJECTS = $(am_src_mock_OBJECTS) src_mock_LDADD = $(LDADD) @@ -83,8 +86,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(src_mock_SOURCES) -DIST_SOURCES = $(src_mock_SOURCES) +SOURCES = src/daemontest.c $(src_mock_SOURCES) +DIST_SOURCES = src/daemontest.c $(src_mock_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -253,6 +256,7 @@ RELEASE_STRING = $(RELEASE_NAME)-$(RELEASE_VERSION) MOCK_LIBTOOL_CURRENT = @MOCK_LIBTOOL_CURRENT@ MOCK_LIBTOOL_REVISION = @MOCK_LIBTOOL_REVISION@ MOCK_LIBTOOL_AGE = @MOCK_LIBTOOL_AGE@ +#TESTS = docs/make_check.sh CLEANFILES = mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp \ version $(EXTRA_PROGRAMS) py/*.pyc py/mock/*.pyc \ py/mock/plugins/*.pyc @@ -368,12 +372,24 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done src/$(am__dirstamp): @$(MKDIR_P) src @: > src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/$(DEPDIR) @: > src/$(DEPDIR)/$(am__dirstamp) +src/daemontest.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/daemontest$(EXEEXT): $(src_daemontest_OBJECTS) $(src_daemontest_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/daemontest$(EXEEXT) + $(LINK) $(src_daemontest_OBJECTS) $(src_daemontest_LDADD) $(LIBS) src/mock.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/mock$(EXEEXT): $(src_mock_OBJECTS) $(src_mock_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/mock$(EXEEXT) @@ -400,11 +416,13 @@ uninstall-dist_libexecSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f src/daemontest.$(OBJEXT) -rm -f src/mock.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/daemontest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mock.Po@am__quote@ .c.o: @@ -832,6 +850,7 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) check: check-recursive all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) installdirs: installdirs-recursive @@ -869,7 +888,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -940,20 +960,20 @@ uninstall-man: uninstall-man1 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dist_libexecSCRIPTS \ - install-dist_mocketcDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am \ - install-pkgpythonPYTHON install-pluginsPYTHON install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + clean-checkPROGRAMS clean-generic clean-libtool ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am \ + install-dist_libexecSCRIPTS install-dist_mocketcDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-exec-hook install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ + install-pdf-am install-pkgpythonPYTHON install-pluginsPYTHON \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ @@ -971,6 +991,7 @@ install-exec-hook: perl -p -i -e 's|^PKGDATADIR=.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ done +.PHONY: rpm srpm rpm: dist BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ |