thr3ads.net - Vorbis dev - [vorbis-dev] cvs trunk vorbis/ compile patches [Nov 2000]

If this information is useful, please help other people find it:
Share via:

Erik Kruus

2000-Nov-10 14:08 UTC

[vorbis-dev] cvs trunk vorbis/ compile patches

ltconfig placeholder shoud be removed.

Makefile.am  : some stuff copied from branch_beta3
ogg lib must be added only where necesary.
vq subdir Makefile.am'ized, (but installs nothing)
made distclean target slightly more clean
   -- check it by hand first, please ---
also you'll want to remove vq/Makefile if the ...am passes inspection
-------------------------------------------------
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/Makefile.am
vorbis/Makefile.am
--- vorbis-trunk/Makefile.am	Wed Nov  8 04:48:57 2000
+++ vorbis/Makefile.am	Fri Nov 10 16:54:18 2000
@@ -3,5 +3,5 @@
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = lib include doc examples
+SUBDIRS = lib include doc examples vq
 
 m4datadir = $(datadir)/aclocal
@@ -9,4 +9,6 @@
 
 EXTRA_DIST = README AUTHORS COPYING libvorbis.spec vorbis.m4
+DISTCLEANFILES = config.guess config.sub install-sh ltconfig ltmain.sh \
+	mkinstalldirs missing aclocal.m4 configure doc
 
 debug:
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/configure.in
vorbis/configure.in
--- vorbis-trunk/configure.in	Wed Nov  8 03:36:35 2000
+++ vorbis/configure.in	Thu Nov  9 23:00:40 2000
@@ -150,5 +150,5 @@
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg
installed!))
+AM_PATH_OGG(LIBS="$LIBS", AC_MSG_ERROR(must have Ogg installed!))
 
 dnl --------------------------------------------------
@@ -167,3 +167,3 @@
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile
doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile
include/vorbis/Makefile examples/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile
doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile
include/vorbis/Makefile examples/Makefile vq/Makefile)
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/examples/Makefile.am
vorbis/examples/Makefile.am
--- vorbis-trunk/examples/Makefile.am	Wed Nov  8 02:13:57 2000
+++ vorbis/examples/Makefile.am	Thu Nov  9 21:34:16 2000
@@ -9,15 +9,15 @@
 
 LDFLAGS = -static
-LDADD = ../lib/libvorbis.la
+LDADD = ../lib/libvorbis.la $(OGG_LIBS)
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la 
+encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la $(OGG_LIBS)
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la
$(OGG_LIBS)
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la
$(OGG_LIBS)
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
+seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
 
 debug:
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/lib/Makefile.am
vorbis/lib/Makefile.am
--- vorbis-trunk/lib/Makefile.am	Wed Nov  8 19:53:45 2000
+++ vorbis/lib/Makefile.am	Thu Nov  9 21:13:49 2000
@@ -20,9 +20,9 @@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LIBADD = libvorbis.la
+#libvorbisfile_la_LIBADD = libvorbis.la
 libvorbisfile_la_LDFLAGS = -version-info
@VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LIBADD = libvorbis.la
+#libvorbisenc_la_LIBADD = libvorbis.la
 libvorbisenc_la_LDFLAGS = -version-info
@VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
 
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/ltconfig
vorbis/ltconfig
--- vorbis-trunk/ltconfig	Thu Nov  9 23:57:27 2000
+++ vorbis/ltconfig	Wed Dec 31 19:00:00 1969
@@ -1,4 +0,0 @@
-This is not used.  And should be removed once a suitable automake comes
-out that doesn't hardcode this file in.
-
-jack.
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/vq/Makefile
vorbis/vq/Makefile
--- vorbis-trunk/vq/Makefile	Tue Nov  7 22:23:23 2000
+++ vorbis/vq/Makefile	Wed Dec 31 19:00:00 1969
@@ -1,90 +0,0 @@
-# $Id: Makefile,v 1.3 2000/11/08 03:23:23 xiphmont Exp $
-
-###############################################################################
-#                                                                             #
-# These are vq codebook generation tools for use by team members.  This       #
-# makefile assumes gcc.                                                       #
-#                                                                             #
-# One need not build these utils to make libvorbis                            #
-#                                                                             #
-###############################################################################
-
-FLAGS=-I. -I../lib -I../include 
-OPT=-O20 $(FLAGS)
-DEBUG=-g -Wall $(FLAGS)
-PROFILE=-g -pg -O20 $(FLAGS)
-CC=gcc
-LD=gcc
-LDFLAGS=$(FLAGS)
-LIBS=-lm 
-
-HFILES =	../lib/codebook.h vqgen.h vqext.h bookutil.h
-
-OFILES = 	vqgen.o vqsplit.o bookutil.o ../lib/sharedbook.o
-ALLOFILES = 	$(OFILES) lspdata.o genericdata.o train.o build.o run.o\
-		cascade.o partition.o metrics.o residuedata.o latticebuild.o\
-		latticepare.o latticehint.o latticetune.o
-
-all:
-	$(MAKE) target CFLAGS="$(OPT)"
-
-debug:	
-	$(MAKE) target CFLAGS="$(DEBUG)"
-
-profile: 
-	$(MAKE) target CFLAGS="$(PROFILE)"
-
-target:	lspvqtrain genericvqtrain residuevqtrain vqbuild vqcascade vqmetrics
latticebuild latticepare latticehint latticetune huffbuild residuesplit
-
-lspvqtrain:	$(OFILES) lspdata.o train.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-residuevqtrain:	$(OFILES) residuedata.o train.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-genericvqtrain:	$(OFILES) genericdata.o train.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-vqbuild:	$(OFILES) build.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-vqcascade:	$(OFILES) run.o cascade.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-vqmetrics:	$(OFILES) run.o metrics.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-latticebuild:	$(OFILES) latticebuild.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-latticehint:	$(OFILES) latticehint.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-latticepare:	$(OFILES) latticepare.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-latticetune:	$(OFILES) latticetune.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-huffbuild:	$(OFILES) huffbuild.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-residuesplit:	$(OFILES) residuesplit.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-
-$(ALLOFILES): 	$(HFILES)
-
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-$(OFILES):	$(HFILES)
-
-clean:
-	-rm -f *.o *.a test* *~ *.out *.m config.* \
-		lspvqtrain genericvqtrain residuevqtrain\
-		vqbuild vqmetrics latticebuild vqcascade latticepare\
-		huffbuild residuesplit
-
-distclean:	clean
-	-rm -f Makefile
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/vq/Makefile.am
vorbis/vq/Makefile.am
--- vorbis-trunk/vq/Makefile.am	Wed Dec 31 19:00:00 1969
+++ vorbis/vq/Makefile.am	Fri Nov 10 16:40:06 2000
@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+###############################################################################
+#                                                                             #
+# These are vq codebook generation tools for use by team members.  This       #
+# makefile assumes gcc.                                                       #
+#                                                                             #
+# One need not build these utils to make libvorbis                            #
+#                                                                             #
+###############################################################################
+
+AUTOMAKE_OPTIONS = foreign
+
+INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/lib
+noinst_PROGRAMS = lspvqtrain genericvqtrain residuevqtrain vqbuild vqcascade
vqmetrics latticebuild latticepare latticehint latticetune huffbuild
residuesplit
+noinst_LIBRARIES = libvq.a
+libvq_a_SOURCES = vqgen.c vqsplit.c sharedbook.c bookutil.c
+LDADD = libvq.a
+
+lspvqtrain_SOURCES = lspdata.c train.c
+residuevqtrain_SOURCES = residuedata.c train.c
+genericvqtrain_SOURCES = genericdata.c train.c
+vqbuild_SOURCES = build.c
+vqcascade_SOURCES = cascade.c run.c
+vqmetrics_SOURCES = metrics.c run.c
+latticebuild_SOURCES = latticebuild.c
+latticehint_SOURCES = latticehint.c
+latticepare_SOURCES = latticepare.c
+latticetune_SOURCES = latticetune.c
+huffbuild_SOURCES = huffbuild.c
+residuesplit_SOURCES = residuesplit.c
+
+sharedbook.c: ../lib/sharedbook.c
+	cp $< $@
+CLEANFILES=sharedbook.c
+DISTCLEANFILES=Makefile.in
diff -bBu2rN -x CVS -x Make*in -x aclocal.m4 vorbis-trunk/vq/latticetune.c
vorbis/vq/latticetune.c
--- vorbis-trunk/vq/latticetune.c	Tue Nov  7 22:23:23 2000
+++ vorbis/vq/latticetune.c	Thu Nov  9 22:03:51 2000
@@ -26,5 +26,5 @@
 
 static char *strrcmp_i(char *s,char *cmp){
-  return(strncmp(s+strlen(s)-strlen(cmp),cmp,strlen(cmp)));
+  return(strncmp(s+(strlen(s)-strlen(cmp)),cmp,strlen(cmp)));
 }
 

--- >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
'vorbis-dev-request@xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is
needed.
Unsubscribe messages sent to the list will be ignored/filtered.

Erik Kruus

2000-Nov-10 15:18 UTC

head link

[vorbis-dev] cvs trunk vorbis/ compile patches

Ooops, G_Evil pointed out that the correct setup for those other two
libs was to make them supersets.

So, since my libtool 1.3.3 chokes on the
        libvorbisfile_la_LIBADD = libvorbis.la
line, the desired effect can be had by cheating:
        libvorbisfile_la_LIBADD = $(libvorbis_la_OBJECTS)

This runs the commands

/bin/sh ../libtool --mode=link gcc  -O20 -ffast-math -mno-ieee-fp -D_REENTRANT
-fsigned-char -DUSE_MEMORY_H  -o libvorbisfile.la -rpath /usr/local/lib
-version-info 0:0:0 vorbisfile.lo mdct.lo smallft.lo block.lo envelope.lo
window.lo lsp.lo lpc.lo analysis.lo synthesis.lo psy.lo info.lo time0.lo
floor0.lo res0.lo mapping0.lo registry.lo codebook.lo sharedbook.lo iir.lo
lookup.lo -lm  -logg
rm -fr .libs/libvorbisfile.la .libs/libvorbisfile.* .libs/libvorbisfile.*
gcc -shared  vorbisfile.lo mdct.lo smallft.lo block.lo envelope.lo window.lo
lsp.lo lpc.lo analysis.lo synthesis.lo psy.lo info.lo time0.lo floor0.lo res0.lo
mapping0.lo registry.lo codebook.lo sharedbook.lo iir.lo lookup.lo  -lm -logg
-lc  -Wl,-soname -Wl,libvorbisfile.so.0 -o .libs/libvorbisfile.so.0.0.0

which is certainly less pretty than the ultra-modern libtool version.
but heh, it works for me.

erik.

--- >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
'vorbis-dev-request@xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is
needed.
Unsubscribe messages sent to the list will be ignored/filtered.

Apparently Analagous Threads

Search for more possibly parallel threads

Vorbis dev - Nov 2000 - cvs trunk vorbis/ compile patches

[vorbis-dev] cvs trunk vorbis/ compile patches

[vorbis-dev] cvs trunk vorbis/ compile patches

Apparently Analagous Threads