Changeset 0515063 for Makefile


Ignore:
Timestamp:
2017-04-06T20:29:23Z (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rb097945 r0515063  
    163163
    164164$(subdirs):
    165         @$(MAKE) -C $@ $(MAKECMDGOALS)
     165        $(MAKE) -C $@ $(MAKECMDGOALS)
    166166
    167167$(OTR_PI): %.so: $(_SRCDIR_)%.c
    168168        @echo '*' Building plugin $@
    169         @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
     169        $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
    170170
    171171$(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
    172172        @echo '*' Building plugin skype
    173         @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
     173        $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
    174174
    175175$(objects): %.o: $(_SRCDIR_)%.c
    176176        @echo '*' Compiling $<
    177         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     177        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    178178
    179179$(objects): Makefile Makefile.settings config.h
     
    181181$(OUTFILE): $(objects) $(subdirs)
    182182        @echo '*' Linking $(OUTFILE)
    183         @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
     183        $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
    184184ifneq ($(firstword $(STRIP)), \#)
    185185        @echo '*' Stripping $(OUTFILE)
    186         @-$(STRIP) $(OUTFILE)
     186        $(VERBOSE) -$(STRIP) $(OUTFILE)
    187187endif
    188188
Note: See TracChangeset for help on using the changeset viewer.