[Iaxclient-cvs] SF.net SVN: iaxclient: [1041] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1041
          http://svn.sourceforge.net/iaxclient/?rev=1041&view=rev
Author:   jpgrayson
Date:     2007-06-14 15:23:39 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
Fixup 'make dist'. It's pretty complete now. It does leave out codec_h264_vss.[ch]. This is on purpuse since the code is not used and because it references symbols in a proprietary library.
Remove some crust.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac
    trunk/lib/Makefile.am
    trunk/simpleclient/Makefile.am
    trunk/simpleclient/iaxcomm/Makefile.am
    trunk/simpleclient/testcall/Makefile.am
    trunk/simpleclient/tkphone/Makefile.am
    trunk/simpleclient/vtestcall/Makefile.am

Removed Paths:
-------------
    trunk/simpleclient/videotest/Debug/
    trunk/simpleclient/videotest/mihai.vcproj.SPLASH.Mihai Balea.user

Modified: trunk/Makefile.am
===================================================================

--- trunk/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -1,11 +1,21 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lib simpleclient
+DIST_SUBDIRS = lib simpleclient
 
+m4datadir = $(datadir)/aclocal
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = iaxclient.pc
+
 EXTRA_DIST = \
 	README.VisualStudio	\
 	autogen.sh		\
-	contrib
+	contrib			\
+	m4
 
 dist-hook:
-	find $(distdir) -name ".svn" -type d -print0 | xargs -0 rm -rf
+	find $(distdir) "(" -name ".svn" -o -name ".deps" ")" \
+			-type d -print0 | xargs -0 rm -rf
+	find $(distdir) "(" -name "*.lo" -o -name ".dirstamp" ")" \
+			-type f -print0 | xargs -0 rm -f

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/configure.ac	2007-06-14 22:23:39 UTC (rev 1041)
@@ -325,45 +325,31 @@
    fi
 fi
 
-AC_CONFIG_FILES([
-Makefile
-lib/Makefile
-simpleclient/Makefile
-iaxclient.pc
-])
-
 for client in $clients
 do
    case "$client" in
       testcall)
-         AC_CONFIG_FILES([simpleclient/testcall/Makefile]) 
          CLIENTS="$CLIENTS $client";;
 
       vtestcall)
          if ! test x$has_sdl = xyes; then
             AC_MSG_ERROR([vtestcall requires SDL])
          fi
-         AC_CONFIG_FILES([simpleclient/vtestcall/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       iaxcomm)
-         AC_CONFIG_FILES([simpleclient/iaxcomm/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       iaxphone)
-         AC_CONFIG_FILES([simpleclient/iaxphone/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       tkphone)
-         AC_CONFIG_FILES([simpleclient/tkphone/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       WinIAX)
-         AC_CONFIG_FILES([simpleclient/WinIAX/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       wx)
-         AC_CONFIG_FILES([simpleclient/wx/Makefile])
          CLIENTS="$CLIENTS $client";;
 
       *) ;;
@@ -372,6 +358,20 @@
 
 AC_SUBST(CLIENTS)
 
+AC_CONFIG_FILES([
+      Makefile
+      lib/Makefile
+      simpleclient/Makefile
+      iaxclient.pc
+      simpleclient/testcall/Makefile
+      simpleclient/vtestcall/Makefile
+      simpleclient/iaxcomm/Makefile
+      simpleclient/iaxphone/Makefile
+      simpleclient/tkphone/Makefile
+      simpleclient/WinIAX/Makefile
+      simpleclient/wx/Makefile
+])
+
 AC_OUTPUT
 
 AC_MSG_NOTICE([Configured clients: $clients])

Modified: trunk/lib/Makefile.am
===================================================================
--- trunk/lib/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/lib/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -183,14 +183,16 @@
 	libiax2/src/md5.h
 
 EXTRA_DIST = \
+	audio_alsa.c				\
+	audio_alsa.h				\
+	codec_ffmpeg.c				\
+	codec_ffmpeg.h				\
 	sound2c.pl				\
-	gsm/copyright				\
-	gsm/readme				\
-	libiax2/AUTHORS				\
-	libiax2/ChangeLog			\
-	libiax2/COPYING				\
-	libiax2/COPYING.LIB			\
-	libiax2/NEWS				\
-	libiax2/README				\
-	portmixer/LICENSE.txt
+	gsm					\
+	libiax2					\
+	portmixer				\
+	sox					\
+	spandsp					\
+	videoLib				\
+	wince
 

Modified: trunk/simpleclient/Makefile.am
===================================================================
--- trunk/simpleclient/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -1,6 +1,17 @@
 SUBDIRS = $(CLIENTS)
 
+DIST_SUBDIRS = \
+	WinIAX					\
+	iaxcomm					\
+	iaxphone				\
+	testcall				\
+	tkphone					\
+	vtestcall				\
+	wx
+
 EXTRA_DIST = \
-	IAXClientDotNetWrapper \
-	iax2slin \
+	IAXClientDotNetWrapper			\
+	iax2slin				\
+	videotest				\
 	win32
+

Modified: trunk/simpleclient/iaxcomm/Makefile.am
===================================================================
--- trunk/simpleclient/iaxcomm/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/iaxcomm/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -85,4 +85,4 @@
 
 endif MACOSX
 
-EXTRA_DIST = QUICKSTART ring.raw
+EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns

Modified: trunk/simpleclient/testcall/Makefile.am
===================================================================
--- trunk/simpleclient/testcall/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/testcall/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -8,5 +8,5 @@
 AM_CPPFLAGS += -DPOSIXSLEEP
 endif
 
-EXTRA_DIST = .cvsignore
+EXTRA_DIST = .cvsignore testcall-jb.c testcall.vcproj
 

Modified: trunk/simpleclient/tkphone/Makefile.am
===================================================================
--- trunk/simpleclient/tkphone/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/tkphone/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -2,7 +2,7 @@
 bin_SCRIPTS = tkphone
 
 iaxcli_PROGRAMS=iaxcli
-iaxcli_SOURCES = iaxcli.c tones.c
+iaxcli_SOURCES = iaxcli.c tones.c tones.h
 
 iaxclidir = ${libdir}/iaxclient/tkphone
 
@@ -26,4 +26,4 @@
 
 CLEANFILES =
 
-EXTRA_DIST = License
+EXTRA_DIST = License tkiaxphone

Deleted: trunk/simpleclient/videotest/mihai.vcproj.SPLASH.Mihai Balea.user
===================================================================
--- trunk/simpleclient/videotest/mihai.vcproj.SPLASH.Mihai Balea.user	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/videotest/mihai.vcproj.SPLASH.Mihai Balea.user	2007-06-14 22:23:39 UTC (rev 1041)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SPLASH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SPLASH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

Modified: trunk/simpleclient/vtestcall/Makefile.am
===================================================================
--- trunk/simpleclient/vtestcall/Makefile.am	2007-06-14 16:29:38 UTC (rev 1040)
+++ trunk/simpleclient/vtestcall/Makefile.am	2007-06-14 22:23:39 UTC (rev 1041)
@@ -3,3 +3,5 @@
 
 AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS)
 vtestcall_LDADD=$(top_builddir)/lib/libiaxclient.la $(SDL_LIBS)
+
+EXTRA_DIST = vtestcall.vcproj


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


