AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add OggFLAC dirs

Browse Source
This commit is contained in:
Josh Coalson 2002-08-07 17:38:08 +00:00
parent 4061aa8f6e
commit c49380d638
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.lite
View File

@ -27,8 +27,8 @@
# clean : remove all non-distro files # clean : remove all non-distro files
# #
.PHONY: doc libFLAC libFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams .PHONY: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
all: doc libFLAC libFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams all: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
DEFAULT_CONFIG = release DEFAULT_CONFIG = release
@ -49,10 +49,16 @@ libFLAC:
libFLAC++: libFLAC++:
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
libOggFLAC:
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
libOggFLAC++:
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
share: share:
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
flac: libFLAC flac: libFLAC libOggFLAC
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
metaflac: libFLAC share metaflac: libFLAC share
@ -77,6 +83,8 @@ clean:
-(cd doc ; $(MAKE) -f Makefile.lite clean) -(cd doc ; $(MAKE) -f Makefile.lite clean)
-(cd src/libFLAC ; $(MAKE) -f Makefile.lite clean) -(cd src/libFLAC ; $(MAKE) -f Makefile.lite clean)
-(cd src/libFLAC++ ; $(MAKE) -f Makefile.lite clean) -(cd src/libFLAC++ ; $(MAKE) -f Makefile.lite clean)
-(cd src/libOggFLAC ; $(MAKE) -f Makefile.lite clean)
-(cd src/libOggFLAC++ ; $(MAKE) -f Makefile.lite clean)
-(cd src/share ; $(MAKE) -f Makefile.lite clean) -(cd src/share ; $(MAKE) -f Makefile.lite clean)
-(cd src/flac ; $(MAKE) -f Makefile.lite clean) -(cd src/flac ; $(MAKE) -f Makefile.lite clean)
-(cd src/metaflac ; $(MAKE) -f Makefile.lite clean) -(cd src/metaflac ; $(MAKE) -f Makefile.lite clean)

4
configure.in
View File

@ -226,6 +226,10 @@ AC_OUTPUT( \
src/libFLAC/include/private/Makefile \ src/libFLAC/include/private/Makefile \
src/libFLAC/include/protected/Makefile \ src/libFLAC/include/protected/Makefile \
src/libFLAC++/Makefile \ src/libFLAC++/Makefile \
src/libOggFLAC/Makefile \
src/libOggFLAC/include/Makefile \
src/libOggFLAC/include/protected/Makefile \
src/libOggFLAC++/Makefile \
src/flac/Makefile \ src/flac/Makefile \
src/metaflac/Makefile \ src/metaflac/Makefile \
src/plugin_xmms/Makefile \ src/plugin_xmms/Makefile \

6
include/Makefile.am
View File

@ -16,4 +16,8 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
SUBDIRS = FLAC FLAC++ OggFLAC share if FLaC__HAS_OGG
OGGFLAC_DIRS = OggFLAC OggFLAC++
endif
SUBDIRS = FLAC FLAC++ $(OGGFLAC_DIRS) share

8
src/Makefile.am
View File

@ -19,6 +19,11 @@ if FLaC__HAS_XMMS
XMMS_DIRS = plugin_xmms XMMS_DIRS = plugin_xmms
endif endif
if FLaC__HAS_OGG
OGGFLAC_DIRS = libOggFLAC libOggFLAC++
#@@@ tests not written yet: OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
endif
EXTRA_DIST = \ EXTRA_DIST = \
monkeys_audio_utilities \ monkeys_audio_utilities \
plugin_winamp2 \ plugin_winamp2 \
@ -27,11 +32,12 @@ EXTRA_DIST = \
SUBDIRS = \ SUBDIRS = \
libFLAC \ libFLAC \
libFLAC++ \ libFLAC++ \
libOggFLAC \ $(OGGFLAC_DIRS) \
share \ share \
flac \ flac \
metaflac \ metaflac \
$(XMMS_DIRS) \ $(XMMS_DIRS) \
test_libFLAC \ test_libFLAC \
test_libFLAC++ \ test_libFLAC++ \
$(OGGFLAC_TEST_DIRS) \
test_streams test_streams