adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make make's output more readable

Browse Source 
The real command line is now hidden and instead a short message which explains
what is done is displayed. To get back the old behavior, use "make VERBOSE=1".

Thanks to DarthGandalf for this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2094 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-08-03 10:01:36 +00:00
parent e86008ffe0
commit c91d032e6b
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+20 -6
View File
@@ -39,6 +39,16 @@ CLEAN := znc *.o core core.*
DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
ifeq "$(VERBOSE)" ""
Q=@
E=@echo
C=-s
else
Q=
E=@\#
C=
endif
.PHONY: all man modules clean distclean install
all: znc man modules $(LIBZNC)
@@ -55,20 +65,23 @@ ifeq "$(LIBZNC)" ""
OBJS := $(BIN_OBJS) $(LIB_OBJS)
znc: $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(E) Linking znc...
$(Q)$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
else
znc: $(BIN_OBJS) $(LIBZNC)
$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS)
$(E) Linking znc...
$(Q)$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS)
$(LIBZNC): $(LIB_OBJS)
$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS)
$(E) Linking $(LIBZNC)...
$(Q)$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS)
endif
man:
@$(MAKE) -C man
@$(MAKE) -C man $(C)
modules: $(LIBZNC)
@$(MAKE) -C modules;
@$(MAKE) -C modules $(C)
clean:
rm -rf $(CLEAN)
@@ -80,7 +93,8 @@ distclean: clean
%.o: %.cpp Makefile
@mkdir -p .depend
$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
$(E) Building $@...
$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
install: znc $(LIBZNC)
mkdir -p $(DESTDIR)$(bindir)
man/Makefile.in
+10 -1
View File
@@ -13,10 +13,19 @@ INSTALL_DATA := @INSTALL_DATA@
MAN1 := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
ifeq "$(VERBOSE)" ""
Q=@
E=@echo
else
Q=
E=@\#
endif
all: $(MAN1)
%.1.gz: %.1 Makefile
gzip -9 <$< >$@
$(E) Packing man page $<...
$(Q)gzip -9 <$< >$@
clean:
-rm -f $(MAN1)
modules/Makefile.in
+10 -1
View File
@@ -33,6 +33,14 @@ INSTALL_DATA := @INSTALL_DATA@
TCL_FLAGS:= @TCL_FLAGS@
ifeq "$(VERBOSE)" ""
Q=@
E=@echo
else
Q=
E=@\#
endif
ifneq "$(LIBZNC)" ""
LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR)
endif
@@ -111,7 +119,8 @@ clean:
%.so: %.cpp Makefile
@mkdir -p .depend
@mkdir -p extra
$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))FLAGS) -MMD -MF .depend/$(notdir $@).dep
$(E) Building $(if $(filter %extra/,$(dir $<)),extra )module $(notdir $(basename $@))...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))FLAGS) -MMD -MF .depend/$(notdir $@).dep
modperl_install: create_install_dir
for i in $(srcdir)/*.pm; do \