[Asterisk-cvs] asterisk-addons/asterisk-ooh323c Makefile.am, 1.2, 1.3 Makefile.in, 1.2, 1.3 configure, 1.2, 1.3 configure.in, 1.2, 1.3

vphirke vphirke
Fri Aug 19 14:58:51 CDT 2005 

Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c
In directory mongoose.digium.com:/tmp/cvs-serv4744

Modified Files:
	Makefile.am Makefile.in configure configure.in 
Log Message:
Updated build procedure

Index: Makefile.am
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	26 May 2005 13:34:36 -0000	1.2
+++ Makefile.am	19 Aug 2005 19:01:17 -0000	1.3
@@ -1,14 +1,28 @@
 AUTOMAKE_OPTIONS = gnu
+CFLAGS = @OOH323CFLAGS@
+INSTALLPREFIX=@OOASTINSTALL@
+lib_LTLIBRARIES = libchan_h323.la
+libchan_h323_la_LDFLAGS = -L$(top_builddir)/ooh323c/src -version-info 1:1:0
+libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h  ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/eventHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
+
+libchan_h323_la_LIBADD = -lpthread 
+
+
+INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323
+
 
 
 opt:
-	$(MAKE) "CFLAGS = -DGNU -D_GNU_SOURCE -D_REENTRANT -D_COMPACT -O2"  all
+	$(MAKE) "CFLAGS = -DGNU -D_GNU_SOURCE -D_REENTRANT -O2" all
 
 debug:
 	$(MAKE) "CFLAGS = -g -DGNU -D_GNU_SOURCE -D_REENTRANT" all
 
+install: 
+	cp .libs/libchan_h323.so /usr/lib/asterisk/modules/chan_h323.so
+
 sample:
 	cp h323.conf.sample /etc/asterisk/h323.conf
 
-SUBDIRS = . ooh323c src 
+
 EXTRA_DIST = extensions.conf h323.conf README COPYING

Index: Makefile.in
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	26 May 2005 13:34:36 -0000	1.2
+++ Makefile.in	19 Aug 2005 19:01:17 -0000	1.3
@@ -72,7 +72,7 @@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
-INSTALLPREFIX = @INSTALLPREFIX@
+INSTALLPREFIX = @OOASTINSTALL@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -87,30 +87,90 @@
 am__quote = @am__quote@
 install_sh = @install_sh@
[...1096 lines suppressed...]
+	install-libLTLIBRARIES install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool tags uninstall \
+	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
 
 
 opt:
-	$(MAKE) "CFLAGS = -DGNU -D_GNU_SOURCE -D_REENTRANT -D_COMPACT -O2"  all
+	$(MAKE) "CFLAGS = -DGNU -D_GNU_SOURCE -D_REENTRANT -O2" all
 
 debug:
 	$(MAKE) "CFLAGS = -g -DGNU -D_GNU_SOURCE -D_REENTRANT" all
 
+install: 
+	cp .libs/libchan_h323.so /usr/lib/asterisk/modules/chan_h323.so
+
 sample:
 	cp h323.conf.sample /etc/asterisk/h323.conf
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: configure
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure	12 Aug 2005 17:54:28 -0000	1.2
+++ configure	19 Aug 2005 19:01:17 -0000	1.3
@@ -1853,7 +1853,7 @@
 
 
 
-OOH323CFLAGS="-DGNU -D_GNU_SOURCE -fPIC -D_OOINFO -D_REENTRANT -D_COMPACT"
+OOH323CFLAGS="-DGNU -D_GNU_SOURCE -D_REENTRANT -D_COMPACT"
 
 
 
@@ -9242,7 +9242,7 @@
 done
 
 
-                                                            ac_config_files="$ac_config_files Makefile src/Makefile ooh323c/Makefile ooh323c/src/Makefile ooh323c/tests/Makefile ooh323c/tests/chansetup/Makefile"
+          ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -9785,11 +9785,6 @@
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "ooh323c/Makefile" ) CONFIG_FILES="$CONFIG_FILES ooh323c/Makefile" ;;
-  "ooh323c/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ooh323c/src/Makefile" ;;
-  "ooh323c/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES ooh323c/tests/Makefile" ;;
-  "ooh323c/tests/chansetup/Makefile" ) CONFIG_FILES="$CONFIG_FILES ooh323c/tests/chansetup/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

Index: configure.in
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.in	12 Aug 2005 17:54:28 -0000	1.2
+++ configure.in	19 Aug 2005 19:01:17 -0000	1.3
@@ -21,7 +21,7 @@
 AC_SUBST(INSTALLPREFIX)
 
 
-OOH323CFLAGS="-DGNU -D_GNU_SOURCE -fPIC -D_OOINFO -D_REENTRANT -D_COMPACT"
+OOH323CFLAGS="-DGNU -D_GNU_SOURCE -D_REENTRANT -D_COMPACT"
 AC_SUBST(OOH323CFLAGS)
 
 
@@ -50,5 +50,5 @@
 AC_CHECK_FUNCS([gettimeofday inet_ntoa memchr memset select socket gethostbyname gethostname pipe])
 
 dnl AC_OUTPUT
-AC_OUTPUT(Makefile src/Makefile ooh323c/Makefile ooh323c/src/Makefile ooh323c/tests/Makefile ooh323c/tests/chansetup/Makefile)
+AC_OUTPUT(Makefile)

More information about the svn-commits mailing list