[xiph-commits] r7059 - trunk/speex/src

[jm at dactyl.lonelymoon.com]

Author: jm
Date: Thu Jul  8 21:31:02 2004
New Revision: 7059

Modified:
trunk/speex/src/Makefile.am
trunk/speex/src/speexdec.c
trunk/speex/src/speexenc.c
Log:
changed the name of the version macro, removed some libtool stuff in
Makefile.am that was causing problem.


Modified: trunk/speex/src/Makefile.am
===================================================================
--- trunk/speex/src/Makefile.am	2004-07-09 04:28:06 UTC (rev 7058)
+++ trunk/speex/src/Makefile.am	2004-07-09 04:31:01 UTC (rev 7059)
@@ -19,10 +19,8 @@

speexenc_SOURCES = speexenc.c wav_io.c
speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \
-	$(OGG_LDFLAGS) $(OGG_LIBS) \
-	@LTLIBOBJS@
+	$(OGG_LDFLAGS) $(OGG_LIBS)

speexdec_SOURCES = speexdec.c wav_io.c
speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
-	$(OGG_LDFLAGS) $(OGG_LIBS) \
-	@LTLIBOBJS@
+	$(OGG_LDFLAGS) $(OGG_LIBS)

Modified: trunk/speex/src/speexdec.c
===================================================================
--- trunk/speex/src/speexdec.c	2004-07-09 04:28:06 UTC (rev 7058)
+++ trunk/speex/src/speexdec.c	2004-07-09 04:31:01 UTC (rev 7059)
@@ -285,13 +285,13 @@

void version()
{
-   printf ("speexdec (Speex decoder) version " VERSION " (compiled " __DATE__ ")\n");
+   printf ("speexdec (Speex decoder) version " SPEEX_VERSION " (compiled " __DATE__ ")\n");
printf ("Copyright (C) 2002-2003 Jean-Marc Valin\n");
}

void version_short()
{
-   printf ("speexdec version " VERSION "\n");
+   printf ("speexdec version " SPEEX_VERSION "\n");
printf ("Copyright (C) 2002-2003 Jean-Marc Valin\n");
}


Modified: trunk/speex/src/speexenc.c
===================================================================
--- trunk/speex/src/speexenc.c	2004-07-09 04:28:06 UTC (rev 7058)
+++ trunk/speex/src/speexenc.c	2004-07-09 04:31:01 UTC (rev 7059)
@@ -143,13 +143,13 @@

void version()
{
-   printf ("speexenc (Speex encoder) version " VERSION " (compiled " __DATE__ ")\n");
+   printf ("speexenc (Speex encoder) version " SPEEX_VERSION " (compiled " __DATE__ ")\n");
printf ("Copyright (C) 2002-2003 Jean-Marc Valin\n");
}

void version_short()
{
-   printf ("speexenc version " VERSION "\n");
+   printf ("speexenc version " SPEEX_VERSION "\n");
printf ("Copyright (C) 2002-2003 Jean-Marc Valin\n");
}

@@ -268,7 +268,7 @@
SpeexHeader header;
int nframes=1;
int complexity=3;
-   char *vendor_string = "Encoded with Speex " VERSION;
+   char *vendor_string = "Encoded with Speex " SPEEX_VERSION;
char *comments;
int comments_length;
int close_in=0, close_out=0;