mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make silent make optional

Browse source 
Backport of Thiago's commit 612a6ee2f793 ("Make the "silent mode"
compilation be optional only.") from the Qt branch.

Requested-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-13 09:05:15 -07:00
parent f7001929d0
commit cf8f0be00d
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -45,6 +45,16 @@ PRODVERSION_STRING := $(shell [ -d .git ] && \
$(GET_VERSION) win $(VERSION_STRING) || \ $(GET_VERSION) win $(VERSION_STRING) || \
echo "$(VERSION).0.0") echo "$(VERSION).0.0")
# 'pretty' output (easy to spot warnings) by default
# 'verbose' output (all the details) by calling with "make V=1"
ifeq ($(V),1)
PRETTYECHO=true
COMPILE_PREFIX=
else
PRETTYECHO=echo
COMPILE_PREFIX=@
endif
# find libdivecomputer # find libdivecomputer
# First deal with the cross compile environment and with Mac. # First deal with the cross compile environment and with Mac.
# For the native case, Linus doesn't want to trust pkg-config given # For the native case, Linus doesn't want to trust pkg-config given
@ -178,7 +188,8 @@ DEPS = $(wildcard .dep/*.dep)
all: $(NAME) all: $(NAME)
$(NAME): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST) $(NAME): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST)
$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) @$(PRETTYECHO) ' LINK' $(NAME)
$(COMPILE_PREFIX)$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
gen_version_file: gen_version_file:
ifneq ($(STORED_VERSION_STRING),$(VERSION_STRING)) ifneq ($(STORED_VERSION_STRING),$(VERSION_STRING))
@ -282,9 +293,9 @@ EXTRA_FLAGS = $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
$(LIBSOUPCFLAGS) $(OSMGPSMAPFLAGS) $(GCONF2CFLAGS) $(LIBSOUPCFLAGS) $(OSMGPSMAPFLAGS) $(GCONF2CFLAGS)
%.o: %.c %.o: %.c
@echo ' CC' $< @$(PRETTYECHO) ' CC' $<
@mkdir -p .dep @mkdir -p .dep
@$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $< $(COMPILE_PREFIX)$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
share/locale/%.UTF-8/LC_MESSAGES/subsurface.mo: po/%.po po/%.aliases share/locale/%.UTF-8/LC_MESSAGES/subsurface.mo: po/%.po po/%.aliases
mkdir -p $(dir $@) mkdir -p $(dir $@)
@ -305,8 +316,8 @@ satellite.png: satellite.svg
# The following creates the pixbuf data in .h files with the basename followed by '_pixmap' # The following creates the pixbuf data in .h files with the basename followed by '_pixmap'
# as name of the data structure # as name of the data structure
%.h: %.png %.h: %.png
@echo ' gdk-pixbuf-csource' $< @$(PRETTYECHO) ' gdk-pixbuf-csource' $<
@gdk-pixbuf-csource --struct --name `echo $* | sed 's/-/_/g'`_pixbuf $< > $@ $(COMPILE_PREFIX)gdk-pixbuf-csource --struct --name `echo $* | sed 's/-/_/g'`_pixbuf $< > $@
doc: doc:
$(MAKE) -C Documentation doc $(MAKE) -C Documentation doc