Changeset 0515063


Ignore:
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'

Files:
12 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

  • configure

    rb097945 r0515063  
    3939purple=0
    4040
     41verbose=0
    4142doc=1
    4243debug=0
    … …  
    125126--pidfile=...                                           $pidfile
    126127--config=...                                            $config
     128
     129--verbose=0/1   Disable/enable verbose build            $verbose
    127130
    128131--msn=0/1       Disable/enable MSN part                 $msn
    … …  
    282285        debug=1
    283286fi
     287
     288if [ "$verbose" = "0" ]; then
     289        echo 'VERBOSE=@' >> Makefile.settings
     290else
     291        echo 'VERBOSE=' >> Makefile.settings
     292fi
     293
     294cat <<EOF >>Makefile.settings
     295
     296# Enable/disable output verbosity
     297ifdef V
     298ifeq (\$(V),1)
     299        VERBOSE=
     300else
     301        VERBOSE=@
     302endif
     303endif
     304
     305EOF
    284306
    285307if [ "$debug" = "1" ]; then

  • ipc.c

    rb097945 r0515063  
    898898        strcpy(un_addr.sun_path, IPCSOCKET);
    899899
    900         serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
     900        serversock = socket(AF_UNIX, SOCK_STREAM, 0);
    901901
    902902        if (serversock == -1) {

  • lib/Makefile

    rb097945 r0515063  
    3636lib.o: $(objects) $(subdirs)
    3737        @echo '*' Linking lib.o
    38         @$(LD) $(LFLAGS) $(objects) -o lib.o
     38        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
    3939
    4040$(objects): ../Makefile.settings Makefile
    … …  
    4242$(objects): %.o: $(_SRCDIR_)%.c
    4343        @echo '*' Compiling $<
    44         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     44        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4545
    4646-include .depend/*.d

  • protocols/Makefile

    rb097945 r0515063  
    4343
    4444$(subdirs):
    45         @$(MAKE) -C $@ $(MAKECMDGOALS)
     45        $(MAKE) -C $@ $(MAKECMDGOALS)
    4646
    4747### MAIN PROGRAM
    … …  
    4949protocols.o: $(objects) $(subdirs)
    5050        @echo '*' Linking protocols.o
    51         @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
     51        $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
    5252
    5353$(objects): ../Makefile.settings Makefile
    … …  
    5555$(objects): %.o: $(_SRCDIR_)%.c
    5656        @echo '*' Compiling $<
    57         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     57        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    5858
    5959-include .depend/*.d

  • protocols/jabber/Makefile

    rb097945 r0515063  
    3838$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    40         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     40        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4141
    4242jabber_mod.o: $(objects)
    4343        @echo '*' Linking jabber_mod.o
    44         @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
     44        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
    4545
    4646-include .depend/*.d

  • protocols/msn/Makefile

    rb097945 r0515063  
    3838$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    40         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     40        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4141
    4242msn_mod.o: $(objects)
    4343        @echo '*' Linking msn_mod.o
    44         @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
     44        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
    4545
    4646-include .depend/*.d

  • protocols/oscar/Makefile

    rb097945 r0515063  
    3939$(objects): %.o: $(_SRCDIR_)%.c
    4040        @echo '*' Compiling $<
    41         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     41        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4242
    4343oscar_mod.o: $(objects)
    4444        @echo '*' Linking oscar_mod.o
    45         @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
     45        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
    4646
    4747-include .depend/*.d

  • protocols/purple/Makefile

    rb097945 r0515063  
    3939$(objects): %.o: $(_SRCDIR_)%.c
    4040        @echo '*' Compiling $<
    41         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     41        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4242
    4343purple_mod.o: $(objects)
    4444        @echo '*' Linking purple_mod.o
    45         @$(LD) $(LFLAGS) $(objects) -o purple_mod.o
     45        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
    4646
    4747-include .depend/*.d

  • protocols/twitter/Makefile

    rb097945 r0515063  
    3838$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    40         @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
     40        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
    4141
    4242twitter_mod.o: $(objects)
    4343        @echo '*' Linking twitter_mod.o
    44         @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
     44        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
    4545       
    4646-include .depend/*.d

  • tests/Makefile

    rb097945 r0515063  
    2121check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
    2222        @echo '*' Linking $@
    23         @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
     23        $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
    2424
    2525%.o: $(_SRCDIR_)%.c
    2626        @echo '*' Compiling $<
    27         @$(CC) -c $(CFLAGS) $< -o $@
     27        $(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@

  • tests/check.c

    rb097945 r0515063  
    1414        int sock[2];
    1515
    16         if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, sock) < 0) {
     16        if (socketpair(AF_UNIX, SOCK_STREAM, 0, sock) < 0) {
    1717                perror("socketpair");
    1818                return FALSE;
Note: See TracChangeset for help on using the changeset viewer.