[xiph-cvs] cvs commit: ogg/include/ogg2 Makefile Makefile.in os_types.h
Monty
xiphmont at xiph.org
Thu Mar 27 01:19:43 PST 2003
xiphmont 03/03/27 04:19:43
Modified: . Tag: libogg2-zerocopy README configure.in ogg.m4
include/ogg2 Tag: libogg2-zerocopy Makefile Makefile.in
os_types.h
Log:
Minor build system updates for libogg2
Revision Changes Path
No revision
<p>No revision
<p>1.10.2.1 +3 -3 ogg/README
Index: README
===================================================================
RCS file: /usr/local/cvsroot/ogg/README,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- README 11 Jul 2002 09:09:06 -0000 1.10
+++ README 27 Mar 2003 09:19:42 -0000 1.10.2.1
@@ -5,7 +5,7 @@
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
-* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
+* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -95,9 +95,9 @@
"interpret DOS and Unix paths" is turned on in your project; it can be
found in the "access paths" pane in your project settings. Now simply
add the shared libraries you need to your project (OggLib at least)
-and #include "ogg/ogg.h" wherever you need to acces Ogg functionality.
+and #include "ogg2/ogg.h" wherever you need to acces Ogg functionality.
(Build instructions for Ogg codecs such as vorbis are similar and may
be found in those source modules' README files)
-$Id: README,v 1.10 2002/07/11 09:09:06 xiphmont Exp $
+$Id: README,v 1.10.2.1 2003/03/27 09:19:42 xiphmont Exp $
<p><p>1.24.2.2 +4 -4 ogg/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/configure.in,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- configure.in 11 Dec 2002 22:28:52 -0000 1.24.2.1
+++ configure.in 27 Mar 2003 09:19:42 -0000 1.24.2.2
@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/framing.c)
+AC_INIT(src/sync.c)
-AM_INIT_AUTOMAKE(libogg,2.0)
+AM_INIT_AUTOMAKE(libogg,3.0)
dnl Library versioning
-LIB_CURRENT=5
+LIB_CURRENT=6
LIB_REVISION=0
LIB_AGE=0
AC_SUBST(LIB_CURRENT)
@@ -289,4 +289,4 @@
AC_SUBST(CFLAGS)
AC_SUBST(PROFILE)
-AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/ogg/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile debian/Makefile)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/ogg/Makefile include/Makefile include/ogg2/Makefile include/ogg2/config_types.h win32/Makefile debian/Makefile)
<p><p>1.10.2.1 +2 -2 ogg/ogg.m4
Index: ogg.m4
===================================================================
RCS file: /usr/local/cvsroot/ogg/ogg.m4,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- ogg.m4 9 Jul 2002 12:54:42 -0000 1.10
+++ ogg.m4 27 Mar 2003 09:19:42 -0000 1.10.2.1
@@ -49,7 +49,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ogg/ogg.h>
+#include <ogg2/ogg.h>
int main ()
{
@@ -75,7 +75,7 @@
LIBS="$LIBS $OGG_LIBS"
AC_TRY_LINK([
#include <stdio.h>
-#include <ogg/ogg.h>
+#include <ogg2/ogg.h>
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding Ogg or finding the wrong"
<p><p>No revision
<p>No revision
<p>1.1.2.2 +5 -5 ogg/include/ogg2/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile 6 Mar 2003 23:12:27 -0000 1.1.2.1
+++ Makefile 27 Mar 2003 09:19:43 -0000 1.1.2.2
@@ -69,7 +69,7 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIBTOOL_DEPS = ./ltmain.sh
LIB_AGE = 0
-LIB_CURRENT = 5
+LIB_CURRENT = 6
LIB_REVISION = 0
LN_S = ln -s
MAKEINFO = makeinfo
@@ -85,7 +85,7 @@
STRIP = strip
USIZE16 = u_int16_t
USIZE32 = u_int32_t
-VERSION = 2.0
+VERSION = 3.0
AUTOMAKE_OPTIONS = foreign
@@ -106,7 +106,7 @@
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign include/ogg/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign include/ogg2/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@@ -161,14 +161,14 @@
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-subdir = include/ogg
+subdir = include/ogg2
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/ogg/Makefile
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/ogg2/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
<p><p>1.1.2.2 +3 -3 ogg/include/ogg2/Attic/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/Makefile.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.in 6 Mar 2003 23:12:27 -0000 1.1.2.1
+++ Makefile.in 27 Mar 2003 09:19:43 -0000 1.1.2.2
@@ -106,7 +106,7 @@
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign include/ogg/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign include/ogg2/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@@ -161,14 +161,14 @@
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-subdir = include/ogg
+subdir = include/ogg2
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/ogg/Makefile
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/ogg2/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
<p><p>1.1.2.2 +2 -2 ogg/include/ogg2/Attic/os_types.h
Index: os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/os_types.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- os_types.h 6 Mar 2003 23:12:28 -0000 1.1.2.1
+++ os_types.h 27 Mar 2003 09:19:43 -0000 1.1.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h,v 1.1.2.1 2003/03/06 23:12:28 xiphmont Exp $
+ last mod: $Id: os_types.h,v 1.1.2.2 2003/03/27 09:19:43 xiphmont Exp $
********************************************************************/
#ifndef _OS_TYPES_H
@@ -83,7 +83,7 @@
#else
# include <sys/types.h>
-# include <ogg/config_types.h>
+# include <ogg2/config_types.h>
#endif
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list