From d2a015f858a7c199d8411f2f83dd071f10c308ae Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Sat, 18 Nov 2000 05:02:35 +0000 Subject: [PATCH] made vq for new build system svn path=/trunk/vorbis/; revision=1083 --- Makefile.am | 5 ++-- configure.in | 2 +- vq/.cvsignore | 2 ++ vq/Makefile | 90 ---------------------------------------------------------- vq/Makefile.am | 46 ++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 93 deletions(-) create mode 100644 vq/.cvsignore delete mode 100644 vq/Makefile create mode 100644 vq/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5471cfd..ea9c235 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,12 +2,13 @@ AUTOMAKE_OPTIONS = foreign dist-zip -SUBDIRS = lib include doc examples win32 debian +SUBDIRS = lib include doc examples win32 debian vq m4datadir = $(datadir)/aclocal m4data_DATA = vorbis.m4 -EXTRA_DIST = README AUTHORS COPYING libvorbis.spec vorbis.m4 +EXTRA_DIST = README AUTHORS COPYING libvorbis.spec vorbis.m4 acinclude.m4\ + todo.txt debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/configure.in b/configure.in index 4e826b2..d06f134 100644 --- a/configure.in +++ b/configure.in @@ -166,4 +166,4 @@ AC_SUBST(DEBUG) AC_SUBST(PROFILE) 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 win32/Makefile debian/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 win32/Makefile debian/Makefile vq/Makefile) diff --git a/vq/.cvsignore b/vq/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/vq/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/vq/Makefile b/vq/Makefile deleted file mode 100644 index 2c8e285..0000000 --- a/vq/Makefile +++ /dev/null @@ -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 --git a/vq/Makefile.am b/vq/Makefile.am new file mode 100644 index 0000000..f605da7 --- /dev/null +++ b/vq/Makefile.am @@ -0,0 +1,46 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@ + +EXTRA_PROGRAMS = lspvqtrain genericvqtrain residuevqtrain vqbuild\ + vqcascade vqmetrics latticebuild latticepare latticehint\ + latticetune huffbuild residuesplit +CLEANFILES = $(EXTRA_PROGRAMS) + +LDFLAGS = -static +LDADD = ../lib/libvorbis.la + +lspvqtrain_SOURCES = lspdata.c train.c vqgen.c bookutil.c\ + vqgen.h bookutil.h vqext.h +genericvqtrain_SOURCES = genericdata.c train.c vqgen.c bookutil.c\ + vqgen.h bookutil.h vqext.h +residuevqtrain_SOURCES = residuedata.c train.c vqgen.c bookutil.c\ + vqgen.h bookutil.h vqext.h +vqbuild_SOURCES = build.c vqgen.c bookutil.c vqsplit.c\ + vqgen.h bookutil.h vqext.h +vqcascade_SOURCES = run.c cascade.c vqgen.c bookutil.c\ + vqgen.h bookutil.h +vqmetrics_SOURCES = run.c metrics.c vqgen.c bookutil.c\ + vqgen.h bookutil.h +latticebuild_SOURCES = latticebuild.c vqgen.c bookutil.c\ + vqgen.h bookutil.h +latticepare_SOURCES = latticepare.c vqgen.c bookutil.c vqsplit.c\ + vqgen.h bookutil.h +latticehint_SOURCES = latticehint.c bookutil.c\ + bookutil.h +latticetune_SOURCES = latticetune.c vqgen.c bookutil.c\ + vqgen.h bookutil.h +huffbuild_SOURCES = huffbuild.c vqgen.c bookutil.c\ + vqgen.h bookutil.h +residuesplit_SOURCES = residuesplit.c vqgen.c bookutil.c\ + vqgen.h bookutil.h + +EXTRA_DIST = residue_entropy auxpartition.pl + +debug: + $(MAKE) all CFLAGS="@DEBUG@" + +profile: + $(MAKE) all CFLAGS="@PROFILE@" -- 2.7.4