Merge branch 'master' of git.osmocom.org:erlang/signerl

This commit is contained in:
Vance Shipley 2011-03-30 16:21:33 -04:00
commit f6478299b4
8 changed files with 20 additions and 19 deletions

View File

@ -1,5 +1,5 @@
all: all:
cd gsm && $(MAKE) cd GSM && $(MAKE)
cd ansi && $(MAKE) #cd ansi && $(MAKE)

View File

@ -31,6 +31,6 @@ ansi:
.PHONY: clean .PHONY: clean
clean: clean:
- rm -f $(BEAMS) - rm -f $(BEAMS)
cd gsm && $(MAKE) $@ cd GSM && $(MAKE) $@
cd ansi && $(MAKE) $@ cd ANSI && $(MAKE) $@

View File

@ -1,11 +1,11 @@
.PHONY: all .PHONY: all
all: all:
cd itu && $(MAKE) cd ITU && $(MAKE)
cd ansi && $(MAKE) cd ANSI && $(MAKE)
.PHONY: clean .PHONY: clean
clean: clean:
cd itu && $(MAKE) $@ cd ITU && $(MAKE) $@
cd ansi && $(MAKE) $@ cd ANSI && $(MAKE) $@

View File

@ -7,7 +7,7 @@ SRC = ../../src
%.html:${SRC}/%.erl %.html:${SRC}/%.erl
${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop ${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop
%.html:${SRC}/itu/%.erl %.html:${SRC}/ITU/%.erl
${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop ${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop
DOCS = tcap.html tcap_tco_server.html DOCS = tcap.html tcap_tco_server.html

View File

@ -67,8 +67,8 @@
-include("sccp.hrl"). -include("sccp.hrl").
%% record definitions for TCAP messages %% record definitions for TCAP messages
%-include("TCAPMessages.hrl"). %-include("TCAPMessages.hrl").
%-include("UnidialoguePDUs.hrl"). -include("UnidialoguePDUs.hrl").
%-include("DialoguePDUs.hrl"). -include("DialoguePDUs.hrl").
%% the dialogue_fsm state data %% the dialogue_fsm state data
-record(state, {usap, tco, supid, cco, otid, did, parms, appContextMode}). -record(state, {usap, tco, supid, cco, otid, did, parms, appContextMode}).

View File

@ -53,7 +53,8 @@
-behaviour(gen_fsm). -behaviour(gen_fsm).
%% call backs needed for gen_fsm behaviour %% call backs needed for gen_fsm behaviour
-export([init/1, handle_event/3, handle_info/3, terminate/3, code_change/4]). %-export([init/1, handle_event/3, handle_info/3, terminate/3, code_change/4]).
-export([handle_info/3, terminate/3, code_change/4]).
%% invocation_fsm state callbacks %% invocation_fsm state callbacks
-export([]). -export([]).
@ -76,8 +77,8 @@
%% handle any other message %% handle any other message
handle_info(Info, StateName, State) -> handle_info(Info, StateName, State) ->
error_logger:format("~w (~w) received unexpected message: ~w~n", [?Module, self(), Event]), error_logger:format("~w (~w) received unexpected message: ~w~n", [?MODULE, self(), Info]),
{next_state, StateName, State}; {next_state, StateName, State}.
%% handle a shutdown request %% handle a shutdown request
terminate(_Reason, _StateName, State) -> ok. terminate(_Reason, _StateName, State) -> ok.

View File

@ -159,7 +159,7 @@
% export the gen_server call backs % export the gen_server call backs
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
terminate/2, code_change/3]). terminate/2]).
% behaviour modules must export this function % behaviour modules must export this function
-export([behaviour_info/1]). -export([behaviour_info/1]).

View File

@ -26,15 +26,15 @@ all: $(BEAMS) itu ansi
.PHONY: itu .PHONY: itu
itu: itu:
cd itu && $(MAKE) cd ITU && $(MAKE)
.PHONY: ansi .PHONY: ansi
ansi: ansi:
cd ansi && $(MAKE) cd ANSI && $(MAKE)
.PHONY: clean .PHONY: clean
clean: clean:
- rm -f $(BEAMS) - rm -f $(BEAMS)
cd itu && $(MAKE) $@ cd ITU && $(MAKE) $@
cd ansi && $(MAKE) $@ cd ANSI && $(MAKE) $@