Build tests and docs via automake and add them to dist.

5 files changed, 68 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index e71e3cd..19fbacd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,8 @@
+SUBDIRS = . tests
+if MAKE_DOC
+SUBDIRS += doc
+endif
+
 lib_LTLIBRARIES = %D%/librtmidi.la
 %C%_librtmidi_la_LDFLAGS = -no-undefined
 %C%_librtmidi_la_SOURCES = \
@@ -11,3 +16,8 @@ rtmidi_inc_HEADERS = \
 
 pkgconfigdatadir = $(libdir)/pkgconfig
 pkgconfigdata_DATA = rtmidi.pc
+
+EXTRA_DIST = autogen.sh readme doc msw
+
+dist-hook:
+	$(MAKE) -C doc
diff --git a/configure.ac b/configure.ac
index 0dd978c..bcaada8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 AC_INIT(RtMidi, 2.1.0, gary@music.mcgill.ca, rtmidi)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(RtMidi.cpp)
-AC_CONFIG_FILES([rtmidi-config rtmidi.pc Makefile tests/Makefile])
+AC_CONFIG_FILES([rtmidi-config rtmidi.pc Makefile tests/Makefile doc/Makefile])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
 # Enable some nice automake features if they are available
@@ -55,6 +55,10 @@ fi
 
 CXXFLAGS="$CXXFLAGS $cxxflag"
 
+# Checks for doxygen
+AC_CHECK_PROG( DOXYGEN, [doxygen], [doxygen] )
+AM_CONDITIONAL( MAKE_DOC, [test "x${DOXYGEN}" != x] )
+
 # Checks for package options and external software
 AC_CANONICAL_HOST
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..6a52d94
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,31 @@
+
+MAINTAINERCLEANFILES=Makefile.in 
+
+CLEANFILES=doxygen-build.stamp
+
+DOX=Doxyfile
+
+EXTRA_DIST=html
+
+INSTIMAGES=html/doxygen.png
+
+DOC_STAMPS=html-build.stamp
+
+DOC_DIR=$(HTML_DIR)
+
+all-local: doxygen-build.stamp
+
+doxygen-build.stamp: doxygen/$(DOX) $(top_srcdir)/RtMidi.h $(top_srcdir)/rtmidi_c.h
+	@echo '*** Running doxygen ***'
+	cd doxygen; $(DOXYGEN) $(DOX)
+	touch doxygen-build.stamp
+
+clean-local:
+	rm -f *~ *.bak $(DOC_STAMPS) || true
+	if test -d html; then rm -fr html; fi
+	if test -d latex; then rm -fr latex; fi
+	if test -d man; then rm -fr man; fi
+
+distclean-local: clean
+	rm -f *.stamp || true
+	if test -d html; then rm -rf html; fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..b6bdcec
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,22 @@
+
+noinst_PROGRAMS = midiprobe midiout qmidiin cmidiin sysextest
+
+midiprobe_CXXFLAGS = -Wall -I$(top_srcdir)
+midiprobe_SOURCES = midiprobe.cpp
+midiprobe_LDADD = $(top_builddir)/librtmidi.la
+
+midiout_CXXFLAGS = -Wall -I$(top_srcdir)
+midiout_SOURCES = midiout.cpp
+midiout_LDADD = $(top_builddir)/librtmidi.la
+
+qmidiin_CXXFLAGS = -Wall -I$(top_srcdir)
+qmidiin_SOURCES = qmidiin.cpp
+qmidiin_LDADD = $(top_builddir)/librtmidi.la
+
+cmidiin_CXXFLAGS = -Wall -I$(top_srcdir)
+cmidiin_SOURCES = cmidiin.cpp
+cmidiin_LDADD = $(top_builddir)/librtmidi.la
+
+sysextest_CXXFLAGS = -Wall -I$(top_srcdir)
+sysextest_SOURCES = sysextest.cpp
+sysextest_LDADD = $(top_builddir)/librtmidi.la
diff --git a/tests/Makefile.in b/tests/Makefile.in
deleted file mode 100644
index 42cb354..0000000
--- a/tests/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
-### RtMidi tests Makefile - for various flavors of unix
-
-PROGRAMS = midiprobe midiout qmidiin cmidiin sysextest
-RM = /bin/rm
-SRC_PATH = ..
-INCLUDE = @top_srcdir@
-OBJECT_PATH = @object_path@
-vpath %.o $(OBJECT_PATH)
-
-OBJECTS	=	@top_srcdir@/RtMidi.o
-
-CC       = @CXX@
-DEFS     = @CPPFLAGS@
-CFLAGS   = @CXXFLAGS@
-CFLAGS  += -I$(INCLUDE) -I$(INCLUDE)/include
-LIBRARY  = @LIBS@
-
-%.o : $(SRC_PATH)/%.cpp
-	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
-
-all : $(PROGRAMS)
-
-midiprobe : @srcdir@/midiprobe.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o midiprobe $^ $(LIBRARY)
-
-midiout : @srcdir@/midiout.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o midiout $^ $(LIBRARY)
-
-qmidiin : @srcdir@/qmidiin.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o qmidiin $^ $(LIBRARY)
-
-cmidiin : @srcdir@/cmidiin.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o cmidiin $^ $(LIBRARY)
-
-sysextest : @srcdir@/sysextest.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o sysextest $^ $(LIBRARY)
-
-clean : 
-	$(RM) -f $(OBJECT_PATH)/*.o
-	$(RM) -f $(PROGRAMS) *.exe
-	$(RM) -f *~
-	$(RM) -fR *.dSYM
-
-distclean: clean
-	$(RM) -f Makefile
-
-strip : 
-	strip $(PROGRAMS)