Folks,

Attached are patches to HEAD which clean up application packaging.

A new library application named "yxa" is created and included in
the other application specifications.  The lists of modules and
registered processes has been updated.  Changed *.rel to *.rel-in
and generate release files with correct versions.

The .beam and .app files are built into a new ../ebin directory.

        -Vance
Index: yaws/src/Makefile.in
===================================================================
--- yaws/src/Makefile.in        (revision 1648)
+++ yaws/src/Makefile.in        (working copy)
@@ -52,7 +52,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -82,4 +82,5 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(top_srcdir)/src/include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(top_srcdir)/src/include/ -W 
+debug_info $<
+
Index: yaws/src/yxa_yaws_util.erl
===================================================================
--- yaws/src/yxa_yaws_util.erl  (revision 1648)
+++ yaws/src/yxa_yaws_util.erl  (working copy)
@@ -241,7 +241,7 @@
 %%--------------------------------------------------------------------
 get_var(A, Name) when is_list(Name) ->
     case yaws_api:queryvar(A, Name) of
-       {ok, QValue} when is_list(QValue) ->
+       QValue when is_list(QValue) ->
            {ok, QValue};
        _ ->
            Method = case get({yxa_yaws_util, method}) of
@@ -254,7 +254,7 @@
            case Method of
                'POST' ->
                    case yaws_api:postvar(A, Name) of
-                       {ok, PValue} when is_list(PValue) ->
+                       PValue when is_list(PValue) ->
                            {ok, PValue};
                        _ ->
                            undefined
Index: src/outgoingproxy.rel-in
===================================================================
--- src/outgoingproxy.rel-in    (revision 0)
+++ src/outgoingproxy.rel-in    (revision 0)
@@ -0,0 +1,8 @@
+%% Erlang OTP R11B-2 library versions
+{release, {"YXA outgoingproxy","1.0"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {mnesia, "4.3.3"},
+  {yxa, "%VERSION%"},
+  {outgoingproxy, "%VERSION%"}]}.
Index: src/Makefile.in
===================================================================
--- src/Makefile.in     (revision 1648)
+++ src/Makefile.in     (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -27,8 +27,10 @@
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 
+ERLINCLUDES = $(patsubst %, -I$(srcdir)/%, $(SUBDIRS))
+
 systools_make_script = \
-       $(ERLC) -I$(srcdir) $(srcdir)/$*.rel
+       $(ERLC) -pz ../ebin -I$(srcdir) $(ERLINCLUDES) $*.rel
 
 
 erl_FILES = \
@@ -107,7 +109,7 @@
        appserver.boot \
        outgoingproxy.boot
 
-app_FILES = $(boot_FILES:.boot=.app)
+app_FILES = ../ebin/yxa.app $(boot_FILES:.boot=.app)
 
 CC = gcc
 CFLAGS = -Wall
@@ -119,18 +121,18 @@
        cpl \
        database \
        eldap \
-       event \
        event_handler \
+       mysql \
        include \
        local \
-       mysql \
        sipuserdb \
        transactionlayer \
-       transportlayer
+       transportlayer \
+       event 
 
 RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive 
distclean-recursive doc-recursive
 
-all: $(beam_FILES) all-recursive $(boot_FILES) start_ssl.boot
+all: $(beam_FILES) $(app_FILES) all-recursive $(boot_FILES) start_ssl.boot
 
 $(RECURSIVE_TARGETS):
        @target=`echo $@ | sed s/-recursive//`; \
@@ -142,7 +144,10 @@
 install: $(boot_FILES) $(beam_FILES) $(hrl_FILES) start_ssl.boot 
install-recursive
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
-       for p in $(beam_FILES) $(boot_FILES) $(app_FILES) start_ssl.boot; do \
+       for p in $(beam_FILES) $(app_FILES); do \
+         $(install_DATA) ../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
+       done
+       for p in $(boot_FILES) start_ssl.boot; do \
          $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
@@ -156,6 +161,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.app
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../ebin && rm -f $(beam_FILES) *.app
 
 $(beam_FILES): $(yxa_hrl_FILES)
 $(boot_FILES): $(beam_FILES)
@@ -165,31 +171,58 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/include/ -W +debug_info $<
+       $(ERLC) -o ../ebin -I$(srcdir) -I$(srcdir)/include/ -W +debug_info $<
 
 local.beam: $(srcdir)/local.erl ../config.status
-       $(ERLC) -I$(srcdir) -I$(srcdir)/include/ -W +debug_info 
-DLOCAL_MODULE=$(local_module) $(srcdir)/local.erl
+       $(ERLC) -o ../ebin -I$(srcdir) -I$(srcdir)/include/ -W +debug_info 
-DLOCAL_MODULE=$(local_module) $(srcdir)/local.erl
 
 directory.beam: $(srcdir)/directory.erl ../config.status 
$(srcdir)/eldap/eldap.hrl
-       $(ERLC) -I$(srcdir) -I$(srcdir)/include/ -I$(srcdir)/eldap -W 
+debug_info $(srcdir)/directory.erl
+       $(ERLC) -o ../ebin -I$(srcdir) -I$(srcdir)/include/ -I$(srcdir)/eldap 
-W +debug_info $(srcdir)/directory.erl
 
-.app-in.app:
-       cp $(srcdir)/$*.app-in $*.app
+../ebin/yxa.app:       $(srcdir)/yxa.app-in
+       sed -e 's!%LOCAL_MODULE%!$(local_module)!' \
+                       -e '[EMAIL PROTECTED]@!' < $< > $@
 
+../ebin/incomingproxy.app:     $(srcdir)/incomingproxy.app-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
 
-incomingproxy.boot: incomingproxy.app $(srcdir)/incomingproxy.rel
+../ebin/pstnproxy.app: $(srcdir)/pstnproxy.app-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+../ebin/appserver.app: $(srcdir)/appserver.app-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+../ebin/outgoingproxy.app:     $(srcdir)/outgoingproxy.app-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+incomingproxy.rel:     $(srcdir)/incomingproxy.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+outgoingproxy.rel:     $(srcdir)/outgoingproxy.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+pstnproxy.rel: $(srcdir)/pstnproxy.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+appserver.rel: $(srcdir)/appserver.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+start_ssl.rel: $(srcdir)/start_ssl.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
+
+incomingproxy.boot: ../ebin/incomingproxy.app ../ebin/yxa.app incomingproxy.rel
        $(systools_make_script)
 
-pstnproxy.boot: pstnproxy.app $(srcdir)/pstnproxy.rel
+pstnproxy.boot: ../ebin/pstnproxy.app ../ebin/yxa.app pstnproxy.rel
        $(systools_make_script)
 
-appserver.boot: appserver.app $(srcdir)/appserver.rel
+appserver.boot: ../ebin/appserver.app ../ebin/yxa.app appserver.rel
        $(systools_make_script)
 
-outgoingproxy.boot: outgoingproxy.app $(srcdir)/outgoingproxy.rel
+outgoingproxy.boot: ../ebin/outgoingproxy.app ../ebin/yxa.app outgoingproxy.rel
        $(systools_make_script)
 
-start_ssl.boot: $(srcdir)/start_ssl.rel
+start_ssl.boot: ../ebin/yxa.app start_ssl.rel
        $(systools_make_script)
 
 test: autotest.beam
Index: src/incomingproxy.rel-in
===================================================================
--- src/incomingproxy.rel-in    (revision 0)
+++ src/incomingproxy.rel-in    (revision 0)
@@ -0,0 +1,9 @@
+%% Erlang OTP R11B-2 library versions
+{release, {"YXA incomingproxy","1.0"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {asn1, "1.4.4.11"},
+  {mnesia, "4.3.3"},
+  {yxa, "%VERSION%"},
+  {incomingproxy, "%VERSION%"}]}.
Index: src/appserver.app-in
===================================================================
--- src/appserver.app-in        (revision 1648)
+++ src/appserver.app-in        (working copy)
@@ -1,8 +1,26 @@
 {application, appserver,
  [{description, "SIP application server"},
-  {vsn,"0.0"},
+  {vsn,"%VERSION%"},
   {modules, [
-            appserver
+                       appserver,
+                       appserver_glue,
+                       appserver_test,
+                       cpl_db,
+                       cpl_test_util,
+                       interpret_backend,
+                       interpret_cpl,
+                       interpret_cpl_test,
+                       interpret_time,
+                       interpret_time_test,
+                       test_backend,
+                       time_switch,
+                       ts_date,
+                       ts_datetime,
+                       ts_duration,
+                       xml_parse,
+                       xml_parse_graph,
+                       xml_parse_test,
+                       xml_parse_util
            ]},
   {registered, [
                sipserver_sup,
@@ -13,6 +31,7 @@
                sipsocket_udp,
                transactionlayer
               ]},
+  {included_applications, [yxa]},
   {mod, {sipserver, [appserver]}},
   {env, []},
   {applications,
Index: src/local/Makefile.in
===================================================================
--- src/local/Makefile.in       (revision 1648)
+++ src/local/Makefile.in       (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -51,6 +51,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/local
@@ -68,4 +69,5 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
+
Index: src/pstnproxy.rel-in
===================================================================
--- src/pstnproxy.rel-in        (revision 0)
+++ src/pstnproxy.rel-in        (revision 0)
@@ -0,0 +1,9 @@
+%% Erlang OTP R11B-2 library versions
+{release, {"YXA pstnproxy","1.0"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {asn1, "1.4.4.11"},
+  {mnesia, "4.3.3"},
+  {yxa, "%VERSION%"},
+  {pstnproxy, "%VERSION%"}]}.
Index: src/include/Makefile.in
===================================================================
--- src/include/Makefile.in     (revision 1648)
+++ src/include/Makefile.in     (working copy)
@@ -60,6 +60,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        @echo No need to 'make doc' in here - no source files
Index: src/eldap/Makefile.in
===================================================================
--- src/eldap/Makefile.in       (revision 1648)
+++ src/eldap/Makefile.in       (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -48,7 +48,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -61,6 +61,8 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       rm -rf ELDAPv3.asn1db ELDAPv3.hrl ELDAPv3.erl
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/eldap
@@ -81,4 +83,4 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
Index: src/transportlayer/Makefile.in
===================================================================
--- src/transportlayer/Makefile.in      (revision 1648)
+++ src/transportlayer/Makefile.in      (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -67,7 +67,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -80,6 +80,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/transportlayer
@@ -97,4 +98,4 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
Index: src/appserver.rel-in
===================================================================
--- src/appserver.rel-in        (revision 0)
+++ src/appserver.rel-in        (revision 0)
@@ -0,0 +1,8 @@
+%% Erlang OTP R11B-2 library versions
+{release, {"YXA application server","1.0"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {mnesia, "4.3.3"},
+  {yxa, "%VERSION%"},
+  {appserver, "%VERSION%"}]}.
Index: src/sipuserdb/Makefile.in
===================================================================
--- src/sipuserdb/Makefile.in   (revision 1648)
+++ src/sipuserdb/Makefile.in   (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -56,7 +56,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -69,6 +69,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/sipuserdb
@@ -86,4 +87,5 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
+
Index: src/config/Makefile.in
===================================================================
--- src/config/Makefile.in      (revision 1648)
+++ src/config/Makefile.in      (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -54,7 +54,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -67,6 +67,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 $(beam_FILES): $(yxa_hrl_FILES)
 
@@ -75,7 +76,7 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
 
 doc:
        mkdir -p ../../doc/html/src/config
Index: src/transactionlayer/Makefile.in
===================================================================
--- src/transactionlayer/Makefile.in    (revision 1648)
+++ src/transactionlayer/Makefile.in    (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -56,7 +56,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -69,6 +69,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/transactionlayer
@@ -86,4 +87,5 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
+
Index: src/start_ssl.rel-in
===================================================================
--- src/start_ssl.rel-in        (revision 0)
+++ src/start_ssl.rel-in        (revision 0)
@@ -0,0 +1,9 @@
+%% Erlang OTP R11B-2 library versions
+%% File to get Erlang distribution using SSL started
+{release, {"YXA foo","%VERSION%"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {yxa, "%VERSION%"}
+ ]
+}.
Index: src/database/Makefile.in
===================================================================
--- src/database/Makefile.in    (revision 1648)
+++ src/database/Makefile.in    (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -57,7 +57,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -70,6 +70,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/database
@@ -87,4 +88,4 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
Index: src/outgoingproxy.app-in
===================================================================
--- src/outgoingproxy.app-in    (revision 1648)
+++ src/outgoingproxy.app-in    (working copy)
@@ -1,8 +1,9 @@
 {application, outgoingproxy,
  [{description, "Outgoing SIP proxy"},
-  {vsn,"0.0"},
+  {vsn,"%VERSION%"},
   {modules, [
-            outgoingproxy
+               outgoingproxy,
+               outgoingproxy_test
            ]},
   {registered, [
                sipserver_sup,
@@ -13,6 +14,7 @@
                sipsocket_udp,
                transactionlayer
               ]},
+  {included_applications, [yxa]},
   {mod, {sipserver, [outgoingproxy]}},
   {env, []},
   {applications,
Index: src/event/Makefile.in
===================================================================
--- src/event/Makefile.in       (revision 1648)
+++ src/event/Makefile.in       (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -28,7 +28,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 
 systools_make_script = \
-       $(ERLC) -I$(srcdir) $(srcdir)/$*.rel
+       $(ERLC) -pz ../../ebin -I$(srcdir) $*.rel
 
 
 erl_FILES = \
@@ -73,7 +73,10 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        $(mkinstalldirs) $(DESTDIR)$(sbindir)
-       for p in $(beam_FILES) $(boot_FILES) $(app_FILES); do \
+       for p in $(beam_FILES) $(app_FILES); do \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
+       done
+       for p in $(boot_FILES); do \
          $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
@@ -91,6 +94,7 @@
        rm -f *.beam *.script *.start *.boot *.app
        rm -f *.o ktrace.out erl_crash.dump
        rm -f $(start_FILES)
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/event
@@ -109,13 +113,15 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -pz ../ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -pz ../ -W 
+debug_info $<
 
-.app-in.app:
-       cp $(srcdir)/$*.app-in $*.app
+eventserver.rel:       $(srcdir)/eventserver.rel-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
 
+../../ebin/eventserver.app:    $(srcdir)/eventserver.app-in
+       sed -e '[EMAIL PROTECTED]@!' < $< > $@
 
-eventserver.boot: eventserver.app $(srcdir)/eventserver.rel
+eventserver.boot: ../../ebin/eventserver.app ../../ebin/yxa.app eventserver.rel
        $(systools_make_script)
 
 $(start_FILES): $(top_srcdir)/scripts/init.sh.in ../../config.status
Index: src/event/eventserver.app-in
===================================================================
--- src/event/eventserver.app-in        (revision 1648)
+++ src/event/eventserver.app-in        (working copy)
@@ -1,8 +1,21 @@
 {application, eventserver,
  [{description, "Event package framework server"},
-  {vsn,"0.0"},
+  {vsn,"%VERSION%"},
   {modules, [
-            eventserver
+               active_subscriber,
+               active_subscription,
+               dialog_package,
+               event_mnesia_monitor,
+               event_package,
+               eventserver,
+               eventserver_test,
+               notifylist,
+               presence_package,
+               presence_pidf,
+               presence_xmerl_xml,
+               subscription,
+               event_handler,
+               event_handler_csyslog
            ]},
   {registered, [
                sipserver_sup,
@@ -13,6 +26,7 @@
                sipsocket_udp,
                transactionlayer
               ]},
+%  {included_applications, [yxa]},
   {mod, {sipserver, [eventserver]}},
   {env, []},
   {applications,
Index: src/event/eventserver.rel-in
===================================================================
--- src/event/eventserver.rel-in        (revision 0)
+++ src/event/eventserver.rel-in        (revision 0)
@@ -0,0 +1,9 @@
+%% Erlang OTP R11B-2 library versions
+{release, {"YXA Event package server framework", "1.0"}, {erts, "5.2"},
+ [{kernel,"2.11.2"},
+  {stdlib,"1.14.2"},
+  {ssl, "3.0.12"},
+  {asn1, "1.4.4.11"},
+  {mnesia, "4.3.3"},
+  {yxa, "%VERSION%"},
+  {eventserver, "%VERSION%"}]}.
Index: src/incomingproxy.app-in
===================================================================
--- src/incomingproxy.app-in    (revision 1648)
+++ src/incomingproxy.app-in    (working copy)
@@ -1,18 +1,27 @@
 {application, incomingproxy,
  [{description, "Incoming SIP proxy"},
-  {vsn,"0.0"},
+  {vsn,"%VERSION%"},
   {modules, [
-            incomingproxy
+               incomingproxy,
+               incomingproxy_test,
+               registrar
            ]},
   {registered, [
                sipserver_sup,
+               yxa_monitor,
+               event_mgr,
+               registrar,
+               transportlayer,
+               dialog_server,
+               transactionlayer,
+               ldap_client,
                yxa_config,
                logger,
-               ldap_client,
-               tcp_dispatcher,
+               sipsocket_blacklist,
                sipsocket_udp,
-               transactionlayer
+               tcp_dispatcher
               ]},
+  {included_applications, [yxa]},
   {mod, {sipserver, [incomingproxy]}},
   {env, []},
   {applications,
Index: src/mysql/Makefile.in
===================================================================
--- src/mysql/Makefile.in       (revision 1648)
+++ src/mysql/Makefile.in       (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -53,7 +53,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -66,6 +66,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/mysql
@@ -84,4 +85,4 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
Index: src/pstnproxy.app-in
===================================================================
--- src/pstnproxy.app-in        (revision 1648)
+++ src/pstnproxy.app-in        (working copy)
@@ -1,8 +1,9 @@
 {application, pstnproxy,
  [{description, "PSTN SIP proxy"},
-  {vsn,"0.0"},
+  {vsn,"%VERSION%"},
   {modules, [
-            pstnproxy
+               pstnproxy,
+               pstnproxy_test
            ]},
   {registered, [
                sipserver_sup,
@@ -13,6 +14,7 @@
                sipsocket_udp,
                transactionlayer
               ]},
+  {included_applications, [yxa]},
   {mod, {sipserver, [pstnproxy]}},
   {env, []},
   {applications,
Index: src/event_handler/Makefile.in
===================================================================
--- src/event_handler/Makefile.in       (revision 1648)
+++ src/event_handler/Makefile.in       (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -53,7 +53,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(privdir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in syslog_c-port; do \
          $(install_PROGRAM) $$p $(DESTDIR)$(privdir)/$$f ; \
@@ -66,6 +66,7 @@
        rm -f core *.core *~
        rm -f syslog_c-port *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/event_handler
@@ -83,7 +84,7 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
 
 syslog_c-port: syslog_c-port.o
        $(CC) $(LDFLAGS) $(CFLAGS) -o syslog_c-port syslog_c-port.o
Index: src/cpl/Makefile.in
===================================================================
--- src/cpl/Makefile.in (revision 1648)
+++ src/cpl/Makefile.in (working copy)
@@ -3,7 +3,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:../../ebin
 prefix = @prefix@
 DESTDIR = @DESTDIR@
 SHELL = @SHELL@
@@ -70,7 +70,7 @@
        $(mkinstalldirs) $(DESTDIR)$(beamdir)
        $(mkinstalldirs) $(DESTDIR)$(includedir)
        for p in $(beam_FILES); do \
-         $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
+         $(install_DATA) ../../ebin/$$p $(DESTDIR)$(beamdir)/$$f ; \
        done
        for p in $(hrl_FILES); do \
          $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
@@ -83,6 +83,7 @@
        rm -f core *.core *~
        rm -f *.beam *.script *.start *.boot *.rel *.app *.script
        rm -f *.o ktrace.out erl_crash.dump
+       cd ../../ebin && rm -f $(beam_FILES)
 
 doc:
        mkdir -p ../../doc/html/src/cpl
@@ -100,4 +101,4 @@
 .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
 
 .erl.beam:
-       $(ERLC) -I$(srcdir) -I$(srcdir)/../include/ -W +debug_info $<
+       $(ERLC) -o ../../ebin -I$(srcdir) -I$(srcdir)/../include/ -W 
+debug_info $<
_______________________________________________
Yxa-devel mailing list
Yxa-devel@lists.su.se
https://lists.su.se/mailman/listinfo/yxa-devel

Reply via email to