From b28c52a42f0f989c6cdfdd45f17e950521f68cf8 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 2 May 2003 07:19:00 +0000 Subject: [PATCH] autoconfiscation --- Makefile.am | 11 +++++ autogen.sh | 10 ++++ comedi_calibrate/Makefile.am | 12 +++++ comedi_config/Makefile.am | 8 ++++ configure.ac | 41 ++++++++++++++++ demo/Makefile.am | 92 ++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 38 +++++++++++++++ lib/Makefile.am | 15 ++++++ m4/as-ac-expand.m4 | 34 +++++++++++++ m4/as-libtool.m4 | 39 +++++++++++++++ m4/as-version.m4 | 57 ++++++++++++++++++++++ man/Makefile.am | 5 ++ testing/Makefile.am | 10 ++++ 13 files changed, 372 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 comedi_calibrate/Makefile.am create mode 100644 comedi_config/Makefile.am create mode 100644 configure.ac create mode 100644 demo/Makefile.am create mode 100644 doc/Makefile.am create mode 100644 lib/Makefile.am create mode 100644 m4/as-ac-expand.m4 create mode 100644 m4/as-libtool.m4 create mode 100644 m4/as-version.m4 create mode 100644 man/Makefile.am create mode 100644 testing/Makefile.am diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..c79d188 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,11 @@ + +SUBDIRS = lib comedi_calibrate comedi_config man testing demo doc + +#pkgconfigdir = $(libdir)/pkgconfig +#pkgconfig_DATA = comedilib.pc + +EXTRA_DIST = include debian m4 + +dist-hook: + rm -rf `find $(distdir) -name CVS` + diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..fa59010 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,10 @@ +#!/bin/sh + + +aclocal -I m4 && \ +libtoolize --copy --force && \ +autoheader && \ +autoconf && \ +automake -a -c && \ +./configure --enable-maintainer-mode + diff --git a/comedi_calibrate/Makefile.am b/comedi_calibrate/Makefile.am new file mode 100644 index 0000000..1e7e4fe --- /dev/null +++ b/comedi_calibrate/Makefile.am @@ -0,0 +1,12 @@ + +bin_PROGRAMS = comedi_calibrate + +noinst_HEADERS = calib.h + +comedi_calibrate_SOURCES = \ + comedi_calibrate.c ni.c cb.c cb64.c other.c save_cal.c +comedi_calibrate_CFLAGS = $(COMEDILIB_CFLAGS) +comedi_calibrate_LDADD = $(COMEDILIB_LIBS) + +EXTRA_DIST = results + diff --git a/comedi_config/Makefile.am b/comedi_config/Makefile.am new file mode 100644 index 0000000..22a1a34 --- /dev/null +++ b/comedi_config/Makefile.am @@ -0,0 +1,8 @@ + +bin_PROGRAMS = comedi_config + +comedi_config_SOURCES = \ + comedi_config.c +comedi_config_CFLAGS = $(COMEDILIB_CFLAGS) +comedi_config_LIBS = $(COMEDILIB_LIBS) + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..5df9d65 --- /dev/null +++ b/configure.ac @@ -0,0 +1,41 @@ + +AC_INIT +AC_CANONICAL_TARGET([]) + +AS_VERSION(comedilib, COMEDILIB, 0, 7, 19, 1) +#COMEDILIB_DEBUG="-Wall -Werror" +COMEDILIB_DEBUG="-Wall" +AM_INIT_AUTOMAKE($PACKAGE,$VERSION) +AS_LIBTOOL(COMEDILIB, 0, 7, 18, yes) + +AM_CONFIG_HEADER(config.h) + +ACLOCAL="$ACLOCAL -I m4" + +AM_MAINTAINER_MODE + +AC_PROG_CC +AM_PROG_CC_STDC +AC_ISC_POSIX + +AC_HEADER_STDC([]) + +COMEDILIB_CFLAGS="$COMEDILIB_CFLAGS -I\$(top_srcdir)/include $COMEDILIB_DEBUG" +COMEDILIB_LIBS="$COMEDILIB_LIBS \$(top_builddir)/lib/libcomedi.la -lm" +AC_SUBST(COMEDILIB_CFLAGS) +AC_SUBST(COMEDILIB_LIBS) + +AC_CONFIG_FILES( +Makefile +comedi_calibrate/Makefile +comedi_config/Makefile +doc/Makefile +demo/Makefile +lib/Makefile +man/Makefile +testing/Makefile +) + +AC_OUTPUT + + diff --git a/demo/Makefile.am b/demo/Makefile.am new file mode 100644 index 0000000..404ab5e --- /dev/null +++ b/demo/Makefile.am @@ -0,0 +1,92 @@ + +bin_PROGRAMS = \ + antialias ao_waveform apply_cal cmd dio eeprom_dump info \ + inp inpn insn ledclock mmap outp poll receiver select \ + sender sigio sv tut1 tut2 + + +antialias_SOURCES = antialias.c common.c +antialias_CFLAGS = $(COMEDILIB_CFLAGS) +antialias_LDADD = $(COMEDILIB_LIBS) + +ao_waveform_SOURCES = ao_waveform.c common.c +ao_waveform_CFLAGS = $(COMEDILIB_CFLAGS) +ao_waveform_LDADD = $(COMEDILIB_LIBS) + +apply_cal_SOURCES = apply_cal.c common.c +apply_cal_CFLAGS = $(COMEDILIB_CFLAGS) +apply_cal_LDADD = $(COMEDILIB_LIBS) + +cmd_SOURCES = cmd.c common.c +cmd_CFLAGS = $(COMEDILIB_CFLAGS) +cmd_LDADD = $(COMEDILIB_LIBS) + +dio_SOURCES = dio.c common.c +dio_CFLAGS = $(COMEDILIB_CFLAGS) +dio_LDADD = $(COMEDILIB_LIBS) + +eeprom_dump_SOURCES = eeprom_dump.c common.c +eeprom_dump_CFLAGS = $(COMEDILIB_CFLAGS) +eeprom_dump_LDADD = $(COMEDILIB_LIBS) + +info_SOURCES = info.c common.c +info_CFLAGS = $(COMEDILIB_CFLAGS) +info_LDADD = $(COMEDILIB_LIBS) + +inp_SOURCES = inp.c common.c +inp_CFLAGS = $(COMEDILIB_CFLAGS) +inp_LDADD = $(COMEDILIB_LIBS) + +inpn_SOURCES = inpn.c common.c +inpn_CFLAGS = $(COMEDILIB_CFLAGS) +inpn_LDADD = $(COMEDILIB_LIBS) + +insn_SOURCES = insn.c common.c +insn_CFLAGS = $(COMEDILIB_CFLAGS) +insn_LDADD = $(COMEDILIB_LIBS) + +ledclock_SOURCES = ledclock.c common.c +ledclock_CFLAGS = $(COMEDILIB_CFLAGS) +ledclock_LDADD = $(COMEDILIB_LIBS) + +mmap_SOURCES = mmap.c common.c +mmap_CFLAGS = $(COMEDILIB_CFLAGS) +mmap_LDADD = $(COMEDILIB_LIBS) + +outp_SOURCES = outp.c common.c +outp_CFLAGS = $(COMEDILIB_CFLAGS) +outp_LDADD = $(COMEDILIB_LIBS) + +poll_SOURCES = poll.c common.c +poll_CFLAGS = $(COMEDILIB_CFLAGS) +poll_LDADD = $(COMEDILIB_LIBS) + +receiver_SOURCES = receiver.c common.c +receiver_CFLAGS = $(COMEDILIB_CFLAGS) +receiver_LDADD = $(COMEDILIB_LIBS) + +select_SOURCES = select.c common.c +select_CFLAGS = $(COMEDILIB_CFLAGS) +select_LDADD = $(COMEDILIB_LIBS) + +sender_SOURCES = sender.c common.c +sender_CFLAGS = $(COMEDILIB_CFLAGS) +sender_LDADD = $(COMEDILIB_LIBS) + +sigio_SOURCES = sigio.c common.c +sigio_CFLAGS = $(COMEDILIB_CFLAGS) +sigio_LDADD = $(COMEDILIB_LIBS) + +sv_SOURCES = sv.c common.c +sv_CFLAGS = $(COMEDILIB_CFLAGS) +sv_LDADD = $(COMEDILIB_LIBS) + +tut1_SOURCES = tut1.c +tut1_CFLAGS = $(COMEDILIB_CFLAGS) +tut1_LDADD = $(COMEDILIB_LIBS) + +tut2_SOURCES = tut2.c +tut2_CFLAGS = $(COMEDILIB_CFLAGS) +tut2_LDADD = $(COMEDILIB_LIBS) + + diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..d464634 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,38 @@ + +DOC=comedilib +SGML= advanced.sgml drivers.sgml funcref.sgml glossary.sgml \ + install.sgml intro.sgml other.sgml reference.sgml tutorial.sgml + +EXTRA_DIST=$(SGML) funcref mkref drivers.txt mkdr + +all-local: html $(DOC).pdf man + +locales = de + +$(DOC).pdf: $(DOC).sgml + -docbook2pdf $(DOC).sgml + +html: $(DOC).sgml + -mkdir -p html + -docbook2html -o html $(DOC).sgml + +man: $(DOC).sgml + -mkdir -p man + -docbook2html -o man $(DOC).sgml + +funcref.sgml: funcref mkref + ./mkref funcref >funcref.sgml + +drivers.sgml: drivers.txt mkdr + ./mkdr drivers.txt >drivers.sgml + +$(DOC).sgml: $(SGML) + +messages: .phony + xgettext -k_ -k_s $(shell find .. -name '*.c') + for i in $(locales);do \ + msgmerge po/$$i.po messages.po -o $$i.po; \ + mkdir -p locale/$$i/LC_MESSAGES; \ + msgfmt $$i.po -o locale/$$i/LC_MESSAGES/comedilib.mo; \ + done + diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 0000000..3a0f983 --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,15 @@ + +lib_LTLIBRARIES = libcomedi.la + +noinst_HEADERS = calib_yacc.h comedi_errno.h libinternal.h + +libcomedi_la_SOURCES = \ + buffer.c calib.c calib_lex.c calib_yacc.c cmd.c comedi.c \ + data.c dio.c error.c filler.c get.c ioctl.c range.c sv.c \ + timed.c timer.c + +libcomedi_la_CFLAGS = $(COMEDILIB_CFLAGS) +libcomedi_la_LDFLAGS = -Wl,--version-script=$(srcdir)/version_script + +EXTRA_DIST = version_script + diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4 new file mode 100644 index 0000000..f3393a2 --- /dev/null +++ b/m4/as-ac-expand.m4 @@ -0,0 +1,34 @@ +dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) +dnl example +dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) +dnl will set SYSCONFDIR to /usr/local/etc + +AC_DEFUN(AS_AC_EXPAND, +[ + EXP_VAR=[$1] + FROM_VAR=[$2] + + dnl first expand prefix and exec_prefix if necessary + prefix_save=$prefix + if test "x$prefix" = "xNONE"; then + prefix=/usr/local + fi + exec_prefix_save=$exec_prefix + if test "x$exec_prefix" = "xNONE"; then + exec_prefix=/usr/local + fi + + full_var="$FROM_VAR" + dnl loop until it doesn't change anymore + while true; do + new_full_var="`eval echo $full_var`" + if test "x$new_full_var"="x$full_var"; then break; fi + full_var=$new_full_var + done + + dnl clean up + full_var=$new_full_var + AC_SUBST([$1], "$full_var") + prefix=$prefix_save + exec_prefix=$exec_prefix_save +]) diff --git a/m4/as-libtool.m4 b/m4/as-libtool.m4 new file mode 100644 index 0000000..3997839 --- /dev/null +++ b/m4/as-libtool.m4 @@ -0,0 +1,39 @@ +dnl as-libtool.m4 0.0.2 +dnl autostars m4 macro for libtool versioning +dnl thomas@apestaart.org +dnl +dnl AS_LIBTOOL(PREFIX, CURRENT, REVISION, AGE, USE_RELEASE) +dnl example +dnl AS_VERSION(GST, 2, 0, 0) +dnl +dnl this macro +dnl - defines [$PREFIX]_CURRENT, REVISION AND AGE +dnl - defines [$PREFIX]_LIBVERSION +dnl - defines [$PREFIX]_LT_LDFLAGS to set versioning +dnl - AC_SUBST's them all +dnl +dnl if USE_RELEASE = yes, then add a -release option to the LDFLAGS +dnl with the (pre-defined) [$PREFIX]_VERSION +dnl then use [$PREFIX]_LT_LDFLAGS in the relevant Makefile.am's + +AC_DEFUN(AS_LIBTOOL, +[ + [$1]_CURRENT=[$2] + [$1]_REVISION=[$3] + [$1]_AGE=[$4] + [$1]_LIBVERSION=[$2]:[$3]:[$4] + AC_SUBST([$1]_CURRENT) + AC_SUBST([$1]_REVISION) + AC_SUBST([$1]_AGE) + AC_SUBST([$1]_LIBVERSION) + +dnl [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION" + if test ! -z "[$5]" + then + [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -release $[$1]_VERSION" + fi + AC_SUBST([$1]_LT_LDFLAGS) + + AC_LIBTOOL_DLOPEN + AM_PROG_LIBTOOL +]) diff --git a/m4/as-version.m4 b/m4/as-version.m4 new file mode 100644 index 0000000..72e5142 --- /dev/null +++ b/m4/as-version.m4 @@ -0,0 +1,57 @@ +dnl version.m4 0.0.5 +dnl autostars m4 macro for versioning +dnl thomas@apestaart.org +dnl +dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, ACTION_IF_NO_NANO, ACTION_IF_NANO) +dnl example +dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,) +dnl for a 0.3.2 release version +dnl +dnl this macro +dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO +dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode +dnl - defines [$PREFIX], VERSION, and [$PREFIX]_RELEASE +dnl - executes the relevant action +dnl - AC_SUBST's PACKAGE, VERSION, [$PREFIX] and [$PREFIX]_RELEASE +dnl as well as the little ones +dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents +dnl maintainer mode from running ok +dnl +dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h + +AC_DEFUN(AS_VERSION, +[ + PACKAGE=[$1] + [$2]_MAJOR=[$3] + [$2]_MINOR=[$4] + [$2]_MICRO=[$5] + NANO=[$6] + if test "x$NANO" = "x" || test "x$NANO" = "x0"; + then + AC_MSG_NOTICE(configuring [$1] for release) + VERSION=[$3].[$4].[$5] + [$2]_RELEASE=1 + dnl execute action + ifelse([$7], , :, [$7]) + else + AC_MSG_NOTICE(configuring [$1] for development with nano $NANO) + VERSION=[$3].[$4].[$5].$NANO + [$2]_RELEASE=`date +%Y%m%d_%H%M%S` + dnl execute action + ifelse([$8], , :, [$8]) + fi + + [$2]=$VERSION + AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version]) + AC_SUBST([$2]) + AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version]) + AC_SUBST([$2]_RELEASE) + + AC_SUBST([$2]_MAJOR) + AC_SUBST([$2]_MINOR) + AC_SUBST([$2]_MICRO) + AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name]) + AC_SUBST(PACKAGE) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version]) + AC_SUBST(VERSION) +]) diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..b03e7dc --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,5 @@ + +EXTRA_DIST = comedi.7 comedi_calibrate.8 comedi_config.8 + +man_MANS = comedi.7 comedi_calibrate.8 comedi_config.8 + diff --git a/testing/Makefile.am b/testing/Makefile.am new file mode 100644 index 0000000..497dbd1 --- /dev/null +++ b/testing/Makefile.am @@ -0,0 +1,10 @@ + +bin_PROGRAMS = comedi_test + +comedi_test_SOURCES = \ + bufconfig.c cmd_1.c cmd_2.c cmd_3.c info.c insn_read.c \ + insn_read_time.c inttrig.c lib.c main.c mmap.c mode0_read.c \ + select.c +comedi_test_CFLAGS = $(COMEDILIB_CFLAGS) +comedi_test_LDADD = $(COMEDILIB_LIBS) + -- 2.26.2