Changeset 0515063 for Makefile

Timestamp:

2017-04-06T20:29:23Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

952e264

Parents:

b097945 (diff), c9e9c9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop'

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -163 +163 @@
 
 $(subdirs):
-        @$(MAKE) -C $@ $(MAKECMDGOALS)
+        $(MAKE) -C $@ $(MAKECMDGOALS)
 
 $(OTR_PI): %.so: $(_SRCDIR_)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+        $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
 
 $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
         @echo '*' Building plugin skype
-        @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
+        $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
 
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 $(objects): Makefile Makefile.settings config.h
@@ -181 +181 @@
 $(OUTFILE): $(objects) $(subdirs)
         @echo '*' Linking $(OUTFILE)
-        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
+        $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
 ifneq ($(firstword $(STRIP)), \#)
         @echo '*' Stripping $(OUTFILE)
-        @-$(STRIP) $(OUTFILE)
+        $(VERBOSE) -$(STRIP) $(OUTFILE)
 endif