Permalink
Browse files

Compiling midi library and unit test program.

  • Loading branch information...
bspaans
bspaans committed Feb 9, 2009
1 parent 2f41b4c commit c532fc447a18e213cbef0a26f553d01b6a810232
Showing with 425 additions and 7 deletions.
  1. +2 −1 configure
  2. +1 −0 configure.ac
  3. +17 −0 run_tests.sh
  4. +4 −2 src/Makefile.am
  5. +17 −4 src/Makefile.in
  6. +3 −0 src/midi/Makefile.am
  7. +380 −0 src/midi/Makefile.in
  8. +1 −0 src/midi/fluidsynth.cpp
  9. BIN src/midi/libmingusmidi.a
View
@@ -3724,7 +3724,7 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_files="$ac_config_files Makefile src/Makefile src/core/Makefile src/containers/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/core/Makefile src/containers/Makefile src/midi/Makefile"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
@@ -4411,6 +4411,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;;
"src/containers/Makefile") CONFIG_FILES="$CONFIG_FILES src/containers/Makefile" ;;
+ "src/midi/Makefile") CONFIG_FILES="$CONFIG_FILES src/midi/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
View
@@ -8,6 +8,7 @@ AC_CONFIG_FILES([
src/Makefile
src/core/Makefile
src/containers/Makefile
+ src/midi/Makefile
])
AC_PROG_RANLIB
AC_OUTPUT
View
@@ -6,7 +6,24 @@ tests_run=$?
if [ $tests_run != "134" ]; then
./src/mingus_containers $tests_run
+ tests_run=$?
else
echo "Not passing all tests in core."
+ exit 1
+fi;
+
+
+if [ $tests_run != "134" ]; then
+ ./src/mingus_midi $tests_run
+ tests_run=$?
+else
+ echo "Not passing all tests in containers."
+ exit 1
+fi;
+
+
+if [ $tests_run = "134" ]; then
+ echo "Not passing all tests in containers."
+ exit 1
fi;
View
@@ -1,6 +1,8 @@
-bin_PROGRAMS = mingus_core mingus_containers
+bin_PROGRAMS = mingus_core mingus_containers mingus_midi
mingus_core_SOURCES = mingus_core_tests.c
mingus_containers_SOURCES = mingus_container_tests.cpp
-SUBDIRS = core containers
+mingus_midi_SOURCES = mingus_midi_tests.cpp
+SUBDIRS = core containers midi
mingus_core_LDADD = core/libminguscore.a
mingus_containers_LDADD = containers/libminguscontainers.a core/libminguscore.a
+mingus_midi_LDADD = containers/libminguscontainers.a core/libminguscore.a
View
@@ -34,7 +34,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-bin_PROGRAMS = mingus_core$(EXEEXT) mingus_containers$(EXEEXT)
+bin_PROGRAMS = mingus_core$(EXEEXT) mingus_containers$(EXEEXT) \
+ mingus_midi$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -54,6 +55,10 @@ mingus_containers_DEPENDENCIES = containers/libminguscontainers.a \
am_mingus_core_OBJECTS = mingus_core_tests.$(OBJEXT)
mingus_core_OBJECTS = $(am_mingus_core_OBJECTS)
mingus_core_DEPENDENCIES = core/libminguscore.a
+am_mingus_midi_OBJECTS = mingus_midi_tests.$(OBJEXT)
+mingus_midi_OBJECTS = $(am_mingus_midi_OBJECTS)
+mingus_midi_DEPENDENCIES = containers/libminguscontainers.a \
+ core/libminguscore.a
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -66,8 +71,10 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
-SOURCES = $(mingus_containers_SOURCES) $(mingus_core_SOURCES)
-DIST_SOURCES = $(mingus_containers_SOURCES) $(mingus_core_SOURCES)
+SOURCES = $(mingus_containers_SOURCES) $(mingus_core_SOURCES) \
+ $(mingus_midi_SOURCES)
+DIST_SOURCES = $(mingus_containers_SOURCES) $(mingus_core_SOURCES) \
+ $(mingus_midi_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
@@ -162,9 +169,11 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
mingus_core_SOURCES = mingus_core_tests.c
mingus_containers_SOURCES = mingus_container_tests.cpp
-SUBDIRS = core containers
+mingus_midi_SOURCES = mingus_midi_tests.cpp
+SUBDIRS = core containers midi
mingus_core_LDADD = core/libminguscore.a
mingus_containers_LDADD = containers/libminguscontainers.a core/libminguscore.a
+mingus_midi_LDADD = containers/libminguscontainers.a core/libminguscore.a
all: all-recursive
.SUFFIXES:
@@ -227,6 +236,9 @@ mingus_containers$(EXEEXT): $(mingus_containers_OBJECTS) $(mingus_containers_DEP
mingus_core$(EXEEXT): $(mingus_core_OBJECTS) $(mingus_core_DEPENDENCIES)
@rm -f mingus_core$(EXEEXT)
$(LINK) $(mingus_core_LDFLAGS) $(mingus_core_OBJECTS) $(mingus_core_LDADD) $(LIBS)
+mingus_midi$(EXEEXT): $(mingus_midi_OBJECTS) $(mingus_midi_DEPENDENCIES)
+ @rm -f mingus_midi$(EXEEXT)
+ $(CXXLINK) $(mingus_midi_LDFLAGS) $(mingus_midi_OBJECTS) $(mingus_midi_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -236,6 +248,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mingus_container_tests.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mingus_core_tests.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mingus_midi_tests.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
View
@@ -0,0 +1,3 @@
+noinst_LIBRARIES = libmingusmidi.a
+libmingusmidi_a_SOURCES = fluidsynth.cpp
+libmingusmidi_a_LIBADD = ../containers/libminguscontainers.a
Oops, something went wrong.

0 comments on commit c532fc4

Please sign in to comment.