Changeset 1015

Show
Ignore:
Timestamp:
05/29/06 15:33:57 (6 years ago)
Author:
ilmari
Message:

r1397@vesla: ilmari | 2006-05-29 14:08:16 +0100
Merge testing stuff from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/ilmari/modularisation-branch

    • Property svn:ignore set to
      *-stamp
      build

  • people/ilmari/modularisation-branch/Makefile

    r1013 r1015  
    7575        test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ 
    7676        $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ 
    77          
     77 
    7878install-node-plugins: build 
    7979        for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do                  \ 
    …… 
    217217        tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/ 
    218218        (cd ..; rpmbuild -tb munin-$(RELEASE).tar.gz) 
    219          
     219 
    220220rpm-src: rpm-pre 
    221221        tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/ 
    …… 
    251251        -rm -f build-doc-stamp 
    252252        -rm -f build-man-stamp 
     253        -rm -rf t/install 
    253254 
    254255        -rm -f dists/redhat/munin.spec 
    …… 
    258259        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/ 
    259260 
    260 .PHONY: install install-main install-node install-doc install-man build build-doc deb clean source_dist 
     261ifeq ($(MAKELEVEL),0) 
     262# Re-exec make with the test config 
     263test: t/*.t 
     264        $(MAKE) $@ CONFIG=t/Makefile.config 
     265else 
     266test_plugins = id_default id_root env 
     267test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) 
     268        @for test in t/*.t; do \ 
     269                echo -n "$$test: "; \ 
     270                PERL5LIB=$(PERLLIB) $(PERL) $$test;\ 
     271        done 
     272endif 
     273 
     274$(CONFDIR)/plugins/id_%: $(LIBDIR)/plugins/id 
     275        ln -s $< $@ 
     276 
     277$(CONFDIR)/plugins/%: $(LIBDIR)/plugins/% 
     278        ln -s $< $@ 
     279 
     280t/install:  
     281        $(MAKE) clean install-node install-node-plugins CONFIG=t/Makefile.config INSTALL_PLUGINS=test 
     282 
     283.PHONY: install install-main install-node install-doc install-man build build-doc deb clean source_dist test