Changeset 7fa5c19 for protocols


Ignore:
Timestamp:
2012-02-11T12:55:45Z (12 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.

Location:
protocols
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • 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 $@
Note: See TracChangeset for help on using the changeset viewer.