Changeset 7fa5c19


Ignore:
Timestamp:
2012-02-11T12:55:45Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
eb54f56
Parents:
23445b6
Message:

Rename SRCDIR directory to _SRCDIR_. I guess #907 was caused by SRCDIR
unexpectedly being set to something already.

Files:
14 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r23445b6 r7fa5c19  
    9696        mkdir -p $(DESTDIR)$(INCLUDEDIR)
    9797        install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
    98         for i in $(headers); do install -m 0644 $(SRCDIR)$$i $(DESTDIR)$(INCLUDEDIR); done
     98        for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
    9999        mkdir -p $(DESTDIR)$(PCDIR)
    100100        install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
     
    107107install-etc:
    108108        mkdir -p $(DESTDIR)$(ETCDIR)
    109         install -m 0644 $(SRCDIR)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
    110         install -m 0644 $(SRCDIR)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
     109        install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
     110        install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
    111111
    112112uninstall-etc:
     
    128128        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
    129129        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
    130         install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
    131         install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
    132         install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
     130        install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
     131        install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
     132        install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
    133133        make -C protocols/skype install-doc
    134134endif
     
    161161        @$(MAKE) -C $@ $(MAKECMDGOALS)
    162162
    163 $(OTR_PI): %.so: $(SRCDIR)%.c
     163$(OTR_PI): %.so: $(_SRCDIR_)%.c
    164164        @echo '*' Building plugin $@
    165165        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
    166166
    167 $(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
     167$(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
    168168        @echo '*' Building plugin skype
    169169        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
    170170
    171 $(objects): %.o: $(SRCDIR)%.c
     171$(objects): %.o: $(_SRCDIR_)%.c
    172172        @echo '*' Compiling $<
    173173        @$(CC) -c $(CFLAGS) $< -o $@
  • configure

    r23445b6 r7fa5c19  
    156156        fi
    157157       
    158         echo "SRCDIR=$srcdir/" >> Makefile.settings
     158        echo "_SRCDIR_=$srcdir/" >> Makefile.settings
    159159        CFLAGS="$CFLAGS -I${dst}"
    160160else
  • doc/Makefile

    r23445b6 r7fa5c19  
    11-include ../Makefile.settings
    2 ifdef SRCDIR
    3 SRCDIR := $(SRCDIR)doc/
     2ifdef _SRCDIR_
     3_SRCDIR_ := $(_SRCDIR_)doc/
    44endif
    55
     
    1010install:
    1111        mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
    12         install -m 0644 $(SRCDIR)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
    13         install -m 0644 $(SRCDIR)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
     12        install -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
     13        install -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
    1414        $(MAKE) -C user-guide $@
    1515
  • doc/user-guide/Makefile

    r23445b6 r7fa5c19  
    11-include ../../Makefile.settings
    2 ifdef SRCDIR
    3 SRCDIR := $(SRCDIR)doc/user-guide/
     2ifdef _SRCDIR_
     3_SRCDIR_ := $(_SRCDIR_)doc/user-guide/
    44endif
    55
     
    4242        chmod 0755 $(DESTDIR)$(DATADIR)
    4343        rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
    44         install -m 0644 $(SRCDIR)help.txt $(DESTDIR)$(DATADIR)/help.txt
     44        install -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
    4545
    4646uninstall:
  • lib/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)lib/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)lib/
    1212endif
    1313
     
    4040$(objects): ../Makefile.settings Makefile
    4141
    42 $(objects): %.o: $(SRCDIR)%.c
     42$(objects): %.o: $(_SRCDIR_)%.c
    4343        @echo '*' Compiling $<
    4444        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/
    1212endif
    1313
     
    5353$(objects): ../Makefile.settings Makefile
    5454
    55 $(objects): %.o: $(SRCDIR)%.c
     55$(objects): %.o: $(_SRCDIR_)%.c
    5656        @echo '*' Compiling $<
    5757        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/jabber/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/jabber/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/jabber/
    1212endif
    1313
     
    3636$(objects): ../../Makefile.settings Makefile
    3737
    38 $(objects): %.o: $(SRCDIR)%.c
     38$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    4040        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/msn/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/msn/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/msn/
    1212endif
    1313
     
    3636$(objects): ../../Makefile.settings Makefile
    3737
    38 $(objects): %.o: $(SRCDIR)%.c
     38$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    4040        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/oscar/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/oscar/
    12 CFLAGS += -I$(SRCDIR)
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/oscar/
     12CFLAGS += -I$(_SRCDIR_)
    1313endif
    1414
     
    3737$(objects): ../../Makefile.settings Makefile
    3838
    39 $(objects): %.o: $(SRCDIR)%.c
     39$(objects): %.o: $(_SRCDIR_)%.c
    4040        @echo '*' Compiling $<
    4141        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/purple/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/purple/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/purple/
    1212endif
    1313
     
    3737$(objects): ../../Makefile.settings Makefile
    3838
    39 $(objects): %.o: $(SRCDIR)%.c
     39$(objects): %.o: $(_SRCDIR_)%.c
    4040        @echo '*' Compiling $<
    4141        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/skype/Makefile

    r23445b6 r7fa5c19  
    11-include ../../Makefile.settings
    2 ifdef SRCDIR
    3 SRCDIR := $(SRCDIR)protocols/skype/
     2ifdef _SRCDIR_
     3_SRCDIR_ := $(_SRCDIR_)protocols/skype/
    44endif
    55
     
    2525all: $(LIBS) $(MANPAGES)
    2626
    27 skype.$(SHARED_EXT): $(SRCDIR)skype.c config.mak
     27skype.$(SHARED_EXT): $(_SRCDIR_)skype.c config.mak
    2828ifeq ($(BITLBEE),yes)
    29         $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(SRCDIR)skype.c $(LDFLAGS)
     29        $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(_SRCDIR_)skype.c $(LDFLAGS)
    3030endif
    3131
     
    4545endif
    4646
    47 client: $(SRCDIR)client.c
     47client: $(_SRCDIR_)client.c
    4848
    4949autogen: configure.ac
     
    103103        git shortlog -s -n |sed 's/.*\t//'> AUTHORS
    104104
    105 %.1: $(SRCDIR)%.txt $(SRCDIR)asciidoc.conf
    106         a2x --asciidoc-opts="-f $(SRCDIR)asciidoc.conf" \
     105%.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
     106        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" \
    107107                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $<
  • protocols/twitter/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/twitter/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/twitter/
    1212endif
    1313
     
    3636$(objects): ../../Makefile.settings Makefile
    3737
    38 $(objects): %.o: $(SRCDIR)%.c
     38$(objects): %.o: $(_SRCDIR_)%.c
    3939        @echo '*' Compiling $<
    4040        @$(CC) -c $(CFLAGS) $< -o $@
  • protocols/yahoo/Makefile

    r23445b6 r7fa5c19  
    88
    99-include ../../Makefile.settings
    10 ifdef SRCDIR
    11 SRCDIR := $(SRCDIR)protocols/yahoo/
     10ifdef _SRCDIR_
     11_SRCDIR_ := $(_SRCDIR_)protocols/yahoo/
    1212endif
    1313
     
    3737$(objects): ../../Makefile.settings Makefile
    3838
    39 $(objects): %.o: $(SRCDIR)%.c
     39$(objects): %.o: $(_SRCDIR_)%.c
    4040        @echo '*' Compiling $<
    4141        @$(CC) -c $(CFLAGS) $< -o $@
  • tests/Makefile

    r23445b6 r7fa5c19  
    11-include ../Makefile.settings
    2 ifdef SRCDIR
    3 SRCDIR := $(SRCDIR)tests/
     2ifdef _SRCDIR_
     3_SRCDIR_ := $(_SRCDIR_)tests/
    44endif
    55
     
    2222        @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
    2323
    24 %.o: $(SRCDIR)%.c
     24%.o: $(_SRCDIR_)%.c
    2525        @echo '*' Compiling $<
    2626        @$(CC) -c $(CFLAGS) $< -o $@
Note: See TracChangeset for help on using the changeset viewer.