Changeset b308cf9 for protocols/Makefile


Ignore:
Timestamp:
2010-06-05T23:21:02Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
1fdb0a4
Parents:
3ab1d31 (diff), e774815 (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:

Merging libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/Makefile

    r3ab1d31 rb308cf9  
    88
    99-include ../Makefile.settings
     10ifdef SRCDIR
     11SRCDIR := $(SRCDIR)protocols/
     12endif
    1013
    1114# [SH] Program variables
    … …  
    4952$(objects): ../Makefile.settings Makefile
    5053
    51 $(objects): %.o: %.c
     54$(objects): %.o: $(SRCDIR)%.c
    5255        @echo '*' Compiling $<
    5356        @$(CC) -c $(CFLAGS) $< -o $@
Note: See TracChangeset for help on using the changeset viewer.