1 diff -Naur vorbis.old/Makefile vorbis/Makefile
2 --- vorbis.old/Makefile Sun Nov 2 15:05:33 2003
3 +++ vorbis/Makefile Sun Nov 2 16:50:28 2003
6 AUTOMAKE_OPTIONS = foreign dist-zip
8 -SUBDIRS = lib include doc examples win32 debian vq
9 +SUBDIRS = lib include doc
11 m4datadir = $(datadir)/aclocal
12 m4data_DATA = vorbis.m4
13 diff -Naur vorbis.old/Makefile.am vorbis/Makefile.am
14 --- vorbis.old/Makefile.am Thu Sep 11 22:42:26 2003
15 +++ vorbis/Makefile.am Sun Nov 2 16:50:56 2003
18 AUTOMAKE_OPTIONS = foreign dist-zip
20 -SUBDIRS = lib include doc examples win32 debian vq
21 +#SUBDIRS = lib include doc examples win32 debian vq
22 +SUBDIRS = lib include doc
24 m4datadir = $(datadir)/aclocal
25 m4data_DATA = vorbis.m4
26 diff -Naur vorbis.old/Makefile.in vorbis/Makefile.in
27 --- vorbis.old/Makefile.in Sun Nov 2 02:33:58 2003
28 +++ vorbis/Makefile.in Sun Nov 2 16:51:07 2003
31 AUTOMAKE_OPTIONS = foreign dist-zip
33 -SUBDIRS = lib include doc examples win32 debian vq
34 +#SUBDIRS = lib include doc examples win32 debian vq
35 +SUBDIRS = lib include doc
37 m4datadir = $(datadir)/aclocal
38 m4data_DATA = vorbis.m4
39 diff -Naur vorbis.old/lib/Makefile vorbis/lib/Makefile
40 --- vorbis.old/lib/Makefile Sun Nov 2 15:05:33 2003
41 +++ vorbis/lib/Makefile Sun Nov 2 16:48:57 2003
43 libvorbis_la_LDFLAGS = -no-undefined -version-info 3:0:3
45 libvorbisfile_la_SOURCES = vorbisfile.c
46 -libvorbisfile_la_LDFLAGS = -no-undefined -version-info 4:0:1
47 -libvorbisfile_la_LIBADD = libvorbis.la
48 +libvorbisfile_la_LDFLAGS = -version-info 4:0:1
49 +libvorbisfile_la_LIBADD = -lvorbis
51 libvorbisenc_la_SOURCES = vorbisenc.c
52 -libvorbisenc_la_LDFLAGS = -no-undefined -version-info 2:0:0
53 -libvorbisenc_la_LIBADD = libvorbis.la
54 +libvorbisenc_la_LDFLAGS = -version-info 2:0:0
55 +libvorbisenc_la_LIBADD = -lvorbis
57 EXTRA_PROGRAMS = barkmel tone psytune
58 CLEANFILES = $(EXTRA_PROGRAMS)
60 floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
61 sharedbook.lo lookup.lo bitrate.lo
62 libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
63 -libvorbisenc_la_DEPENDENCIES = libvorbis.la
64 +libvorbisenc_la_DEPENDENCIES =
65 am_libvorbisenc_la_OBJECTS = vorbisenc.lo
66 libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
67 -libvorbisfile_la_DEPENDENCIES = libvorbis.la
68 +libvorbisfile_la_DEPENDENCIES =
69 am_libvorbisfile_la_OBJECTS = vorbisfile.lo
70 libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
71 EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)
72 diff -Naur vorbis.old/lib/Makefile.am vorbis/lib/Makefile.am
73 --- vorbis.old/lib/Makefile.am Sat Jan 18 22:02:20 2003
74 +++ vorbis/lib/Makefile.am Sun Nov 2 16:38:53 2003
76 libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
78 libvorbisfile_la_SOURCES = vorbisfile.c
79 -libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
80 -libvorbisfile_la_LIBADD = libvorbis.la
81 +libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
82 +libvorbisfile_la_LIBADD = -lvorbis
84 libvorbisenc_la_SOURCES = vorbisenc.c
85 -libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
86 -libvorbisenc_la_LIBADD = libvorbis.la
87 +libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
88 +libvorbisenc_la_LIBADD = -lvorbis
90 EXTRA_PROGRAMS = barkmel tone psytune
91 CLEANFILES = $(EXTRA_PROGRAMS)
92 diff -Naur vorbis.old/lib/Makefile.in vorbis/lib/Makefile.in
93 --- vorbis.old/lib/Makefile.in Sun Nov 2 02:34:00 2003
94 +++ vorbis/lib/Makefile.in Sun Nov 2 16:51:10 2003
96 libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
98 libvorbisfile_la_SOURCES = vorbisfile.c
99 -libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
100 -libvorbisfile_la_LIBADD = libvorbis.la
101 +libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
102 +libvorbisfile_la_LIBADD = -lvorbis
104 libvorbisenc_la_SOURCES = vorbisenc.c
105 -libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
106 -libvorbisenc_la_LIBADD = libvorbis.la
107 +libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
108 +libvorbisenc_la_LIBADD = -lvorbis
110 EXTRA_PROGRAMS = barkmel tone psytune
111 CLEANFILES = $(EXTRA_PROGRAMS)
112 @@ -151,10 +151,10 @@
113 floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
114 sharedbook.lo lookup.lo bitrate.lo
115 libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
116 -libvorbisenc_la_DEPENDENCIES = libvorbis.la
117 +libvorbisenc_la_DEPENDENCIES =
118 am_libvorbisenc_la_OBJECTS = vorbisenc.lo
119 libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
120 -libvorbisfile_la_DEPENDENCIES = libvorbis.la
121 +libvorbisfile_la_DEPENDENCIES =
122 am_libvorbisfile_la_OBJECTS = vorbisfile.lo
123 libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
124 EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)