aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-10-05 19:20:42 -0700
committerEric Wong <normalperson@yhbt.net>2008-10-05 19:26:23 -0700
commit8a2306146149d4d7915ed1346a7dbd908fb1048f (patch)
tree3c39419432ba47e4ebb03482428335a55254d162
parent84a4c6e2651916c65f317a52534dbf08529c5bed (diff)
downloadmpd-8a2306146149d4d7915ed1346a7dbd908fb1048f.tar.gz
mpd-8a2306146149d4d7915ed1346a7dbd908fb1048f.tar.xz
mpd-8a2306146149d4d7915ed1346a7dbd908fb1048f.zip
autotools: tidy up make dist
* Add missing headers in Makefile.am * remove mp4ff.dsp (Win32 crap) * Add scripts, m4, bs, autogen.sh to allow for hotfixes by the SCM-challenged. (downloading the source via git is NOT a lightweight operation for everybody).
-rw-r--r--Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/mp4ff/mp4ff.dsp144
3 files changed, 3 insertions, 145 deletions
diff --git a/Makefile.am b/Makefile.am
index 559b216d0..03454230f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.6
SUBDIRS = src doc
docdir = $(prefix)/share/doc/$(PACKAGE)
doc_DATA = README UPGRADING
-EXTRA_DIST = COPYING $(doc_DATA)
+EXTRA_DIST = COPYING $(doc_DATA) m4 autogen.sh bs build.mk scripts .gitignore
sparse-check test:
$(MAKE) -C src $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 5962ed583..bfefd5eec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,7 @@ mpd_headers = \
ack.h \
action_status.h \
audio.h \
+ audio_format.h \
audioOutput.h \
buffer2array.h \
charConv.h \
@@ -68,6 +69,7 @@ mpd_headers = \
outputBuffer_accessors.h \
outputBuffer_audio.h \
outputBuffer_ob_send.h \
+ outputBuffer_sequence.h \
outputBuffer_xfade.h \
path.h \
pcm_utils.h \
diff --git a/src/mp4ff/mp4ff.dsp b/src/mp4ff/mp4ff.dsp
deleted file mode 100644
index e3a2d0899..000000000
--- a/src/mp4ff/mp4ff.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mp4ff" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=mp4ff - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mp4ff.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mp4ff.mak" CFG="mp4ff - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mp4ff - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mp4ff - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mp4ff - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-F90=df.exe
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_TAGGING" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "mp4ff - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-F90=df.exe
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_TAGGING" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "mp4ff - Win32 Release"
-# Name "mp4ff - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\drms.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4atom.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4meta.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4sample.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4tagupdate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4util.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\drms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drmstables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff_int_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ffint.h
-# End Source File
-# End Group
-# End Target
-# End Project