Changeset feb1bad


Ignore:
Timestamp:
2010-08-28T12:24:37Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
02bb9db
Parents:
00374ac (diff), b0a89cc (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:

Pull in Makefile dependencies fix from mainline.

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r00374ac rfeb1bad  
    2020bitlbee.info
    2121bitlbee.exe
     22.depend
  • Makefile

    r00374ac rfeb1bad  
    5252
    5353distclean: clean $(subdirs)
     54        rm -rf .depend
    5455        rm -f Makefile.settings config.h bitlbee.pc
    5556        find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
     57        @# May still be present in dirs of disabled protocols.
     58        find . -name .depend | xargs -r rmdir
    5659        $(MAKE) -C tests distclean
    5760
     
    105108        x=$$(basename $$(pwd)); \
    106109        cd ..; \
    107         tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* $$x
     110        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* --exclude=.depend $$x
    108111
    109112$(subdirs):
     
    131134helloworld:
    132135        @echo Hello World
     136
     137-include .depend/*.d
  • configure

    r00374ac rfeb1bad  
    577577fi
    578578
     579case "$CC" in
     580*gcc* )
     581        echo CFLAGS+=-MD -MF .depend/\$@.d >> Makefile.settings
     582        for i in . lib protocols protocols/*/; do
     583                mkdir -p $i/.depend
     584        done
     585esac
     586
    579587if [ "$msn" = 0 ]; then
    580588        echo '#undef WITH_MSN' >> config.h
  • lib/Makefile

    r00374ac rfeb1bad  
    3030
    3131distclean: clean $(subdirs)
     32        rm -rf .depend
    3233
    3334### MAIN PROGRAM
     
    4243        @echo '*' Compiling $<
    4344        @$(CC) -c $(CFLAGS) $< -o $@
     45
     46-include .depend/*.d
  • protocols/Makefile

    r00374ac rfeb1bad  
    4040
    4141distclean: clean $(subdirs)
     42        rm -rf .depend
    4243
    4344$(subdirs):
     
    5556        @echo '*' Compiling $<
    5657        @$(CC) -c $(CFLAGS) $< -o $@
     58
     59-include .depend/*.d
  • protocols/jabber/Makefile

    r00374ac rfeb1bad  
    3030
    3131distclean: clean
     32        rm -rf .depend
    3233
    3334### MAIN PROGRAM
     
    4243        @echo '*' Linking jabber_mod.o
    4344        @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
     45
     46-include .depend/*.d
  • protocols/msn/Makefile

    r00374ac rfeb1bad  
    3030
    3131distclean: clean
     32        rm -rf .depend
    3233
    3334### MAIN PROGRAM
     
    4243        @echo '*' Linking msn_mod.o
    4344        @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
     45
     46-include .depend/*.d
  • protocols/oscar/Makefile

    r00374ac rfeb1bad  
    3131
    3232distclean: clean
     33        rm -rf .depend
    3334
    3435### MAIN PROGRAM
     
    4344        @echo '*' Linking oscar_mod.o
    4445        @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
     46
     47-include .depend/*.d
  • protocols/purple/Makefile

    r00374ac rfeb1bad  
    3131
    3232distclean: clean
     33        rm -rf .depend
    3334
    3435### MAIN PROGRAM
     
    4344        @echo '*' Linking purple_mod.o
    4445        $(LD) $(LFLAGS) $(objects) -o purple_mod.o
     46
     47-include .depend/*.d
  • protocols/twitter/Makefile

    r00374ac rfeb1bad  
    3030
    3131distclean: clean
     32        rm -rf .depend
    3233
    3334### MAIN PROGRAM
     
    4344        @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
    4445       
    45 
     46-include .depend/*.d
  • protocols/yahoo/Makefile

    r00374ac rfeb1bad  
    3131
    3232distclean: clean
     33        rm -rf .depend
    3334
    3435### MAIN PROGRAM
     
    4344        @echo '*' Linking yahoo_mod.o
    4445        @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
     46
     47-include .depend/*.d
Note: See TracChangeset for help on using the changeset viewer.