|
Last change
on this file since 8768f67 was
5a8afc3,
checked in by dequis <dx@…>, at 2016-11-21T06:58:47Z
|
|
Manual merge with wilmer's approach to handling missing protocols
Turns out he already implemented pretty much the same thing in the
parson branch... last year.
The differences between the two approaches are subtle (there aren't too
many ways to do this, some lines are the exact same thing) but I decided
I like his version better, so this mostly reverts a handful of my
changes while keeping others. The main advantage of his approach is that
no fake protocols are registered, no actual prpl functions are called,
and the missing prpl is a singleton constant.
New things compared to the implementation in the other branch:
- The explain_unknown_protocol() function.
- Fixed named chatrooms throwing a warning and losing the "account"
setting when saving. See changes in irc_im.c
- Fixed the "server" setting dropping when saving. See account.c
Differences with my previous implementation:
- Accounts with missing protocols don't autoconnect
- 'account list' marks them as "(missing!)"
|
-
Property mode set to
100644
|
|
File size:
1.3 KB
|
| Rev | Line | |
|---|
| [b7d3cc34] | 1 | ########################### |
|---|
| 2 | ## Makefile for BitlBee ## |
|---|
| 3 | ## ## |
|---|
| 4 | ## Copyright 2002 Lintux ## |
|---|
| 5 | ########################### |
|---|
| 6 | |
|---|
| 7 | ### DEFINITIONS |
|---|
| 8 | |
|---|
| 9 | -include ../Makefile.settings |
|---|
| [7fa5c19] | 10 | ifdef _SRCDIR_ |
|---|
| 11 | _SRCDIR_ := $(_SRCDIR_)protocols/ |
|---|
| [f60079b] | 12 | endif |
|---|
| [b7d3cc34] | 13 | |
|---|
| 14 | # [SH] Program variables |
|---|
| [5a8afc3] | 15 | objects = account.o bee.o bee_chat.o bee_ft.o bee_user.o nogaim.o |
|---|
| [3ddb7477] | 16 | |
|---|
| [b7d3cc34] | 17 | |
|---|
| 18 | # [SH] The next two lines should contain the directory name (in $(subdirs)) |
|---|
| 19 | # and the name of the object file, which should be linked into |
|---|
| 20 | # protocols.o (in $(subdirobjs)). These need to be in order, i.e. the |
|---|
| 21 | # first object file should be in the first directory. |
|---|
| 22 | subdirs = $(PROTOCOLS) |
|---|
| 23 | subdirobjs = $(PROTOOBJS) |
|---|
| 24 | |
|---|
| 25 | # Expansion of variables |
|---|
| 26 | subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) |
|---|
| 27 | LFLAGS += -r |
|---|
| 28 | |
|---|
| 29 | # [SH] Phony targets |
|---|
| 30 | all: protocols.o |
|---|
| [66b9e86e] | 31 | check: all |
|---|
| [fc5cf88] | 32 | lcov: check |
|---|
| [66b9e86e] | 33 | gcov: |
|---|
| 34 | gcov *.c |
|---|
| [b7d3cc34] | 35 | |
|---|
| 36 | .PHONY: all clean distclean $(subdirs) |
|---|
| 37 | |
|---|
| 38 | clean: $(subdirs) |
|---|
| 39 | rm -f *.o $(OUTFILE) core |
|---|
| 40 | |
|---|
| 41 | distclean: clean $(subdirs) |
|---|
| [b0a89cc] | 42 | rm -rf .depend |
|---|
| [b7d3cc34] | 43 | |
|---|
| 44 | $(subdirs): |
|---|
| 45 | @$(MAKE) -C $@ $(MAKECMDGOALS) |
|---|
| 46 | |
|---|
| 47 | ### MAIN PROGRAM |
|---|
| 48 | |
|---|
| 49 | protocols.o: $(objects) $(subdirs) |
|---|
| 50 | @echo '*' Linking protocols.o |
|---|
| 51 | @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o |
|---|
| 52 | |
|---|
| 53 | $(objects): ../Makefile.settings Makefile |
|---|
| 54 | |
|---|
| [7fa5c19] | 55 | $(objects): %.o: $(_SRCDIR_)%.c |
|---|
| [b7d3cc34] | 56 | @echo '*' Compiling $< |
|---|
| [7281ad1] | 57 | @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
|---|
| [b0a89cc] | 58 | |
|---|
| 59 | -include .depend/*.d |
|---|
Note: See
TracBrowser
for help on using the repository browser.
