diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-06-27 16:14:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-27 16:14:30 +0200 |
| commit | 292c2b90c8a9c7a05f34bdb6900e160f992e4f69 (patch) | |
| tree | 33dbcc223cbd2b0854cf3a1c05afe6a92a847e0d /make/template | |
| parent | 1c9f97682fe2a38d1ad80b059d20e316ccf8b65b (diff) | |
| parent | 0d7d6a9d0909f014e7557b84b2115ca6ff387bf9 (diff) | |
Merge pull request #1186 from SaberUK/master+build-system-cleanup
Pass INSPIRCD_VERBOSE through the environment to unit-cc.
Diffstat (limited to 'make/template')
| -rw-r--r-- | make/template/main.mk | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 78de3a8d1..bff065736 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -114,12 +114,9 @@ FOOTER = finishmessage @TARGET GNU_MAKE SOURCEPATH = $(shell /bin/pwd) @TARGET BSD_MAKE SOURCEPATH != /bin/pwd -@IFDEF INSPIRCD_VERBOSE - VERBOSE = -v -@ELSE +@IFNDEF INSPIRCD_VERBOSE @TARGET GNU_MAKE MAKEFLAGS += --silent @TARGET BSD_MAKE MAKE += -s - VERBOSE = @ENDIF @IFDEF INSPIRCD_STATIC @@ -130,7 +127,7 @@ FOOTER = finishmessage # things like -Wfatal-errors if they wish to. CORECXXFLAGS += $(CXXFLAGS) -@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS +@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS INSPIRCD_VERBOSE SOCKETENGINE CORELDFLAGS @DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC # Default target @@ -281,15 +278,11 @@ deinstall: -rm -f $(BASE)/org.inspircd.plist configureclean: + rm -f .gdbargs rm -f BSDmakefile rm -f GNUmakefile rm -f include/config.h - rm -f inspircd - rm -f inspircd.1 - rm -f inspircd-genssl.1 - -rm -f inspircd.service - -rm -f org.inspircd.plist - -rm -f @CONFIGURE_CACHE_FILE@ + rm -rf @CONFIGURE_DIRECTORY@ distclean: clean configureclean -rm -rf $(SOURCEPATH)/run |