more makefile fun

svn path=/branches/branch_jackoggsvorbis/vorbis/; revision=666

3 files changed, 31 insertions, 94 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e69de29b..4d0108dd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -0,0 +1,10 @@
+## Process this with automake to create Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+
+doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html\
+	 vorbis.html wait.png white-xifish.png
+
+EXTRA_DIST = $(doc_DATA)
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 00000000..fd08d39e
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+INCLUDES = -I$(top_srcdir)/include
+
+lib_LTLIBRARIES = libvorbis.la
+
+libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
+			analysis.c synthesis.c psy.c info.c time0.c floor0.c\
+			res0.c mapping0.c registry.c codebook.c sharedbook.c\
+			iir.c vorbisfile.c\
+			envelope.h lpc.h lsp.h bookinternal.h misc.h psy.h\
+			masking.h sharedbook.h iir.h os.h
+libvorbis_la_LDFLAGS = -version-info 1:0:0
+
+debug:
+	$(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+	$(MAKE) all CFLAGS="@PROFILE@"
diff --git a/lib/Makefile.in b/lib/Makefile.in
deleted file mode 100644
index 0e9b7a9b..00000000
--- a/lib/Makefile.in
+++ /dev/null
@@ -1,94 +0,0 @@
-# vorbis makefile configured for use with gcc on any platform
-# $Id: Makefile.in,v 1.33.4.1.2.1 2000/09/03 08:34:51 jack Exp $
-
-###############################################################################
-#                                                                             #
-# To build a production vorbis (preferrably using gmake), just type 'make'.   #
-# To build with debugging or profiling information, use 'make debug' or       #
-# 'make profile' respectively.  'make clean' is a good idea between builds    #
-# with different target names, or before a final build.                       #
-#                                                                             #
-###############################################################################
-
-
-# DO NOT EDIT BELOW! ##########################################################
-# (unless, of course, you know what you are doing :) ##########################
-
-@SET_MAKE@
-FLAGS=-I. -I../include @CFLAGS@
-OPT=@OPT@ $(FLAGS)
-DEBUG=@DEBUG@ $(FLAGS)
-PROFILE=@PROFILE@ $(FLAGS)
-CC=@CC@
-LD=@CC@
-LDFLAGS=@LDFLAGS@ $(FLAGS)
-AR=@AR@
-RANLIB=@RANLIB@
-LIBS=@LIBS@
-
-HFILES =	../include/vorbis/codec.h \
-		../include/vorbis/backends.h \
-		../include/vorbis/codebook.h \
-		envelope.h lpc.h lsp.h bookinternal.h misc.h\
-		psy.h smallft.h window.h scales.h os.h mdct.h registry.h\
-		masking.h sharedbook.h iir.h
-LFILES = 	mdct.o smallft.o block.o envelope.o window.o\
-		lsp.o lpc.o analysis.o synthesis.o psy.o info.o\
-		time0.o floor0.o res0.o mapping0.o registry.o\
-		codebook.o sharedbook.o iir.o
-VF_HFILES = ../include/vorbis/vorbisfile.h ../include/vorbis/codec.h \
-		../include/vorbis/codebook.h \
-		os.h misc.h 
-VF_LFILES = vorbisfile.o
-
-PSY_FILES = mdct.o psy.o lpc.o smallft.o window.o psytune.o floor0.o \
-	lsp.o codebook.o sharedbook.o
-
-all:
-	$(MAKE) target CFLAGS="$(OPT)"
-
-debug:	
-	$(MAKE) target CFLAGS="$(DEBUG)"
-
-analysis:	
-	$(MAKE) target CFLAGS="$(DEBUG) -DANALYSIS"
-
-profile: 
-	$(MAKE) target CFLAGS="$(PROFILE)"
-
-target:	libvorbis.a vorbisfile.a psytune
-
-selftest:	
-	$(MAKE) clean
-	$(CC) $(DEBUG) $(LDFLAGS) -D_V_SELFTEST sharedbook.c\
-		-o test_sharedbook $(LIBS)
-	$(CC) $(DEBUG) $(LDFLAGS) -c sharedbook.c
-	$(CC) $(DEBUG) $(LDFLAGS) -D_V_SELFTEST codebook.c \
-		sharedbook.o -o test_codebook $(LIBS)
-	@echo
-	@./test_sharedbook
-	@./test_codebook
-
-libvorbis.a: 	$(LFILES)	
-		$(AR) -r libvorbis.a $(LFILES)
-		$(RANLIB) libvorbis.a
-
-vorbisfile.a:	$(VF_LFILES)
-		$(AR) -r vorbisfile.a $(VF_LFILES)
-		$(RANLIB) vorbisfile.a
-
-psytune:	$(PSY_FILES)
-	        $(CC) $(CFLAGS) $(LDFLAGS) $(PSY_FILES) -o $@ $(LIBS)
-
-$(LFILES): 	$(HFILES)
-$(VF_LFILES): 	$(VF_HFILES)
-
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-clean:
-	-rm -f *.o *.a test* *~ *.out ogg config.* tone psytune
-
-distclean:	clean
-	-rm -f Makefile
-