Browse Source

Use non-recursive Automake

Build subdirectories from the top-level Makefile.am; do not use
recursive make calls.
develop
Damien Goutte-Gattat 8 years ago
parent
commit
ea804becbc
  1. 20
      Makefile.am
  2. 5
      configure.ac
  3. 8
      lib/Makefile.am
  4. 1
      man/Makefile.am
  5. 9
      src/Makefile.am

20
Makefile.am

@ -1,7 +1,23 @@
SUBDIRS = lib src man
ACLOCAL_AMFLAGS = -I m4 --install
dist_doc_DATA = AUTHORS COPYING NEWS README
EXTRA_DIST = Doxyfile
convlib_sources = lib/err.compat.h lib/compat.h lib/xmem.c lib/xmem.h \
lib/hexio.c lib/hexio.h
common_sources = src/midi.c src/midi.h src/sysex.c src/sysex.h \
$(convlib_sources)
bin_PROGRAMS = asysex kmxtool
asysex_SOURCES = src/asysex.c src/manufacturers.h $(common_sources)
kmxtool_SOURCES = src/kmxtool.c src/microx.c src/microx.h $(common_sources)
DEFS = -DEXIT_ON_ENOMEM @DEFS@
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/src
LDADD = $(LIBOBJS)
dist_man_MANS = man/asysex.1 man/kmxtool.1

5
configure.ac

@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([config])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_LIBOBJ_DIR([lib])
AC_USE_SYSTEM_EXTENSIONS
AM_INIT_AUTOMAKE([foreign])
AM_INIT_AUTOMAKE([foreign subdir-objects])
dnl Check for development tools
AC_PROG_CC
@ -75,8 +75,7 @@ AC_DEFINE_UNQUOTED([DEFAULT_MIDI_PORT], ["$midi_default_port"],
AC_SUBST([DEFAULT_MIDI_PORT], [$midi_default_port])
dnl Output files
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile
man/Makefile man/asysex.1 man/kmxtool.1])
AC_CONFIG_FILES([Makefile man/asysex.1 man/kmxtool.1])
AC_OUTPUT
dnl Summary

8
lib/Makefile.am

@ -1,8 +0,0 @@
noinst_LIBRARIES = libcvasysex.a
libcvasysex_a_SOURCES = err.compat.h compat.h xmem.c xmem.h \
hexio.c hexio.h
libcvasysex_a_LIBADD = $(LIBOBJS)
DEFS = -DEXIT_ON_ENOMEM @DEFS@

1
man/Makefile.am

@ -1 +0,0 @@
dist_man_MANS = asysex.1 kmxtool.1

9
src/Makefile.am

@ -1,9 +0,0 @@
bin_PROGRAMS = asysex kmxtool
asysex_SOURCES = asysex.c midi.h midi.c sysex.h sysex.c manufacturers.h
kmxtool_SOURCES = kmxtool.c microx.c microx.h midi.c midi.h sysex.c sysex.h
AM_CPPFLAGS = -I$(top_srcdir)/lib
AM_LDFLAGS = -L$(top_builddir)/lib
LDADD = -lcvasysex
Loading…
Cancel
Save