Skip to content
Browse files

Installing header files. Sort of. Missing subdirectories.

  • Loading branch information...
1 parent 175fcd7 commit b5f14867196f9b110f98749820b1efdf69d191b4 bspaans committed Feb 16, 2009
Showing with 47 additions and 117 deletions.
  1. +0 −96 configure
  2. +3 −3 programs/Makefile.am
  3. +6 −6 programs/Makefile.in
  4. +2 −0 src/Makefile.am
  5. +36 −12 src/Makefile.in
View
96 configure
@@ -16041,102 +16041,6 @@ ac_config_headers="$ac_config_headers config.h"
ac_config_files="$ac_config_files Makefile src/Makefile src/core/Makefile src/containers/Makefile src/midi/Makefile programs/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.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
View
6 programs/Makefile.am
@@ -1,9 +1,9 @@
bin_PROGRAMS = note interval triad
interval_SOURCES = interval.c
-interval_LDADD = ../src/core/libminguscore.a
+interval_LDADD = ../src/core/libminguscore.la
triad_SOURCES = triad.c
-triad_LDADD = ../src/core/libminguscore.a
+triad_LDADD = ../src/core/libminguscore.la
note_SOURCES = note.c
-note_LDADD = ../src/core/libminguscore.a
+note_LDADD = ../src/core/libminguscore.la
View
12 programs/Makefile.in
@@ -51,13 +51,13 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_interval_OBJECTS = interval.$(OBJEXT)
interval_OBJECTS = $(am_interval_OBJECTS)
-interval_DEPENDENCIES = ../src/core/libminguscore.a
+interval_DEPENDENCIES = ../src/core/libminguscore.la
am_note_OBJECTS = note.$(OBJEXT)
note_OBJECTS = $(am_note_OBJECTS)
-note_DEPENDENCIES = ../src/core/libminguscore.a
+note_DEPENDENCIES = ../src/core/libminguscore.la
am_triad_OBJECTS = triad.$(OBJEXT)
triad_OBJECTS = $(am_triad_OBJECTS)
-triad_DEPENDENCIES = ../src/core/libminguscore.a
+triad_DEPENDENCIES = ../src/core/libminguscore.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -184,11 +184,11 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
interval_SOURCES = interval.c
-interval_LDADD = ../src/core/libminguscore.a
+interval_LDADD = ../src/core/libminguscore.la
triad_SOURCES = triad.c
-triad_LDADD = ../src/core/libminguscore.a
+triad_LDADD = ../src/core/libminguscore.la
note_SOURCES = note.c
-note_LDADD = ../src/core/libminguscore.a
+note_LDADD = ../src/core/libminguscore.la
all: all-am
.SUFFIXES:
View
2 src/Makefile.am
@@ -11,3 +11,5 @@ mingus_midi_LDADD = containers/libminguscontainers.la core/libminguscore.la midi
lib_LTLIBRARIES = libmingus.la
libmingus_la_SOURCES =
libmingus_la_LIBADD = midi/libmingusmidi.la
+
+include_HEADERS = core/notes.h core/diatonic.h core/chords.h core/intervals.h core/meter.h core/value.h core/core.h core/progressions.h containers/Note.h containers/NoteContainer.h containers/Bar.h containers/BarEntry.h containers/Track.h containers/containers.h midi/midi.h midi/synth.h
View
48 src/Makefile.in
@@ -15,6 +15,7 @@
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -40,7 +41,8 @@ host_triplet = @host@
bin_PROGRAMS = mingus_core$(EXEEXT) mingus_containers$(EXEEXT) \
mingus_midi$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -54,7 +56,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libmingus_la_DEPENDENCIES = midi/libmingusmidi.la
@@ -102,6 +105,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -225,6 +230,7 @@ mingus_midi_LDADD = containers/libminguscontainers.la core/libminguscore.la midi
lib_LTLIBRARIES = libmingus.la
libmingus_la_SOURCES =
libmingus_la_LIBADD = midi/libmingusmidi.la
+include_HEADERS = core/notes.h core/diatonic.h core/chords.h core/intervals.h core/meter.h core/value.h core/core.h core/progressions.h containers/Note.h containers/NoteContainer.h containers/Bar.h containers/BarEntry.h containers/Track.h containers/containers.h midi/midi.h midi/synth.h
all: all-recursive
.SUFFIXES:
@@ -386,6 +392,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+
+uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -520,6 +543,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/containers $(distdir)/core $(distdir)/midi
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -563,12 +587,12 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -616,7 +640,7 @@ info: info-recursive
info-am:
-install-data-am:
+install-data-am: install-includeHEADERS
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
@@ -644,8 +668,8 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
- uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+ uninstall-info-am uninstall-libLTLIBRARIES
uninstall-info: uninstall-info-recursive
@@ -656,15 +680,15 @@ uninstall-info: uninstall-info-recursive
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
+ install-includeHEADERS install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am \
- uninstall-libLTLIBRARIES
+ uninstall-binPROGRAMS uninstall-includeHEADERS \
+ uninstall-info-am uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

0 comments on commit b5f1486

Please sign in to comment.
Something went wrong with that request. Please try again.