zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* versions updated, for the next release 

* equivalent and idempotent dist/tarball targets for both buildsystems.
This commit is contained in:
Pedro Lopez-Cabanillas 2010-08-08 12:04:58 +00:00
parent 191dd546f6
commit 0be960c0d7
8 changed files with 72 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fluidsynth/CMakeLists.txt
View File

@ -29,13 +29,21 @@ set ( PACKAGE "fluidsynth" )
# FluidSynth package version
set ( FLUIDSYNTH_VERSION_MAJOR 1 )
set ( FLUIDSYNTH_VERSION_MINOR 1 )
set ( FLUIDSYNTH_VERSION_MICRO 1 )
set ( FLUIDSYNTH_VERSION_MICRO 2 )
set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
# libfluidsynth - Library version
# libfluidsynth - Library version
# *** NOTICE ***
# Update library version upon each release (follow these steps in order)
# if any source code changes: REVISION++
# if any interfaces added/removed/changed: REVISION=0
# if any interfaces removed/changed (compatibility broken): CURRENT++
# if any interfaces have been added: AGE++
# if any interfaces have been removed/changed (compatibility broken): AGE=0
# This is not exactly the same algorithm as the libtool one, but the results are the same.
set ( LT_VERSION_CURRENT 1 )
set ( LT_VERSION_AGE 3 )
set ( LT_VERSION_AGE 4 )
set ( LT_VERSION_REVISION 0 )
set ( LT_VERSION_INFO "${LT_VERSION_CURRENT}.${LT_VERSION_AGE}.${LT_VERSION_REVISION}" )
@ -385,9 +393,15 @@ if ( UNIX )
COMMAND cp -r include ${PACKAGE}-${VERSION}
COMMAND cp -r src ${PACKAGE}-${VERSION}
COMMAND cp AUTHORS ChangeLog CMakeLists.txt COPYING ${PACKAGE}.* INSTALL NEWS README* THANKS TODO ${PACKAGE}-${VERSION}
COMMAND tar -cj --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.bz2 ${PACKAGE}-${VERSION}
COMMAND tar -cz --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION}
COMMAND zip -qr ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION} -x '*.svn*' -x '*Makefile.am'
# COMMAND tar -cj --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.bz2 ${PACKAGE}-${VERSION}
# COMMAND tar -cz --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION}
# COMMAND zip -qr ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION} -x '*.svn*' -x '*Makefile.am'
COMMAND cp acinclude.m4 autogen.sh configure.ac install-sh missing mkinstalldirs Makefile.am ${PACKAGE}-${VERSION}
COMMAND cp -r macbuild ${PACKAGE}-${VERSION}
COMMAND cp -r winbuild ${PACKAGE}-${VERSION}
COMMAND tar -cj --exclude .svn -f ${PACKAGE}-${VERSION}.tar.bz2 ${PACKAGE}-${VERSION}
COMMAND tar -cz --exclude .svn -f ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION}
COMMAND zip -qr ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION} -x '*.svn*'
COMMAND rm -rf ${PACKAGE}-${VERSION}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)

6
fluidsynth/Makefile.am
View File

@ -2,10 +2,10 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS = macbuild winbuild src doc include
SUBDIRS = macbuild winbuild src doc include cmake_admin
EXTRA_DIST = TODO acinclude.m4 autogen.sh fluidsynth.pc.in \
fluidsynth.spec.in fluidsynth.spec fluidsynth.anjuta README-OSX
fluidsynth.spec.in fluidsynth.spec fluidsynth.anjuta README-OSX \
README.cmake CMakeLists.txt
DISTCLEANFILES = fluidsynth.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fluidsynth.pc

14
fluidsynth/cmake_admin/Makefile.am Normal file
View File

@ -0,0 +1,14 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = CheckDIRSymbolExists.cmake \
CheckPrototypeExists.cmake \
CheckSTDC.cmake \
cmake_uninstall.cmake.in \
CreateLibtoolFile.cmake \
FindMidiShare.cmake \
FindOSS.cmake \
FindPthreads.cmake \
FindReadline.cmake \
report.cmake \
TestInline.cmake \
TestVLA.cmake

7
fluidsynth/configure.ac
View File

@ -8,7 +8,7 @@ dnl *** NOTE *** Don't forget to update library version below also
FLUIDSYNTH_VERSION_MAJOR=1
FLUIDSYNTH_VERSION_MINOR=1
FLUIDSYNTH_VERSION_MICRO=1
FLUIDSYNTH_VERSION_MICRO=2
FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO
AC_SUBST(FLUIDSYNTH_VERSION_MAJOR)
@ -28,9 +28,9 @@ dnl if any interfaces added/removed/changed: lt_current++ and lt_revision=0
dnl if any interfaces have been added: lt_age++
dnl if any interfaces have been removed/changed (compatibility broken): lt_age=0
m4_define([lt_current], [4])
m4_define([lt_current], [5])
m4_define([lt_revision], [0])
m4_define([lt_age], [3])
m4_define([lt_age], [4])
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
AC_SUBST(LT_VERSION_INFO)
@ -456,6 +456,7 @@ AM_CONDITIONAL(LADCCA_SUPPORT, test "$LADCCA_FOUND" = "yes")
AC_OUTPUT([
Makefile
cmake_admin/Makefile
macbuild/Makefile
winbuild/Makefile
winbuild/fluidsynth/Makefile

3
fluidsynth/doc/Makefile.am
View File

@ -1,7 +1,8 @@
# install the man pages and include in distribution
man_MANS = fluidsynth.1
EXTRA_DIST = \
EXTRA_DIST = CMakeLists.txt \
Doxyfile.cmake \
$(man_MANS) \
Doxyfile \
example.c \

1
fluidsynth/include/Makefile.am
View File

@ -3,3 +3,4 @@ SUBDIRS = fluidsynth
include_HEADERS = fluidsynth.h
EXTRA_DIST = CMakeLists.txt

3
fluidsynth/include/fluidsynth/Makefile.am
View File

@ -18,6 +18,5 @@ pkginclude_HEADERS = types.h \
mod.h \
gen.h
EXTRA_DIST = version.h.in
EXTRA_DIST = version.h.in CMakeLists.txt
DISTCLEANFILES = version.h

35
fluidsynth/src/Makefile.am
View File

@ -21,7 +21,7 @@ fluid_coremidi = drivers/fluid_coremidi.c
endif
if DBUS_SUPPORT
fluid_rtkit = bindings/fluid_rtkit.c
fluid_rtkit = bindings/fluid_rtkit.c bindings/fluid_rtkit.h
endif
if JACK_SUPPORT
@ -42,10 +42,10 @@ endif
# if LASH_SUPPORT || LADCCA_SUPPORT (Makefile supports OR?)
if LASH_SUPPORT
fluid_lash = bindings/fluid_lash.c
fluid_lash = bindings/fluid_lash.c bindings/fluid_lash.h
else
if LADCCA_SUPPORT
fluid_lash = bindings/fluid_lash.c
fluid_lash = bindings/fluid_lash.c bindings/fluid_lash.h
endif
endif
@ -54,11 +54,30 @@ fluid_dart = drivers/fluid_dart.c
endif
# Extra files and optional drivers
EXTRA_DIST = fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c drivers/fluid_portaudio.c \
drivers/fluid_coreaudio.c drivers/fluid_alsa.c drivers/fluid_oss.c drivers/fluid_pulse.c \
fluid_dsp_simple.c \
drivers/fluid_sndmgr.c config_macos.h config_macosx.h config_macosx_pb.h \
config_win32.h drivers/fluid_jack.c drivers/fluid_dart.c
EXTRA_DIST = fluid_dll.c \
bindings/fluid_ladspa.c \
bindings/fluid_ladspa.h \
drivers/fluid_alsa.c \
drivers/fluid_coreaudio.c \
drivers/fluid_coremidi.c \
drivers/fluid_dart.c \
drivers/fluid_dsound.c \
drivers/fluid_jack.c \
drivers/fluid_midishare.c \
drivers/fluid_oss.c \
drivers/fluid_portaudio.c \
drivers/fluid_pulse.c \
drivers/fluid_sndmgr.c \
drivers/fluid_winmidi.c \
config_macos.h \
config_macosx.h \
config_macosx_pb.h \
CMakeLists.txt \
config_win32.cmake \
config_win32.h.in \
config.cmake
DISTCLEANFILES = config_win32.h
lib_LTLIBRARIES = libfluidsynth.la
bin_PROGRAMS = fluidsynth