From aeffd250a18d25b8a95bb3013a8eb9e2bdd525cf Mon Sep 17 00:00:00 2001 From: marschap Date: Mon, 16 Jan 2006 19:36:58 +0000 Subject: [PATCH] require automake 1.7 in condifure.in; update all Makefile.am: add comments, replace obsoleted INCLUDES by AM_CPPFLAGS --- Makefile.am | 7 +++++++ clients/Makefile.am | 4 ++++ clients/examples/Makefile.am | 9 +++++++-- clients/headlines/Makefile.am | 5 +++++ clients/lcdexec/Makefile.am | 9 ++++++++- clients/lcdproc/Makefile.am | 9 ++++++++- clients/metar/Makefile.am | 5 +++++ configure.in | 2 +- docs/Makefile.am | 4 ++++ docs/lcdproc-dev/Makefile.am | 6 +++++- docs/lcdproc-user/Makefile.am | 5 +++++ docs/lcdproc-user/drivers/Makefile.am | 4 ++++ scripts/Makefile.am | 4 ++++ server/Makefile.am | 11 ++++++++++- server/commands/Makefile.am | 8 +++++++- server/drivers/Makefile.am | 6 ++++-- shared/Makefile.am | 9 ++++++++- 17 files changed, 96 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1679259..e1edfc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,10 @@ +## Process this file with automake to produce Makefile.in + +## set automake strictness to 'foreign' AUTOMAKE_OPTIONS = foreign + SUBDIRS = shared clients server docs scripts + EXTRA_DIST = LCDd.conf LCDclients.conf README.IRman debian dox: @@ -7,3 +12,5 @@ dox: dist-hook: rm -rf `find $(distdir)/debian -name CVS` + +## EOF diff --git a/clients/Makefile.am b/clients/Makefile.am index efe25c2..9a27627 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -1 +1,5 @@ +## Process this file with automake to produce Makefile.in + SUBDIRS = examples headlines lcdexec lcdproc metar + +## EOF diff --git a/clients/examples/Makefile.am b/clients/examples/Makefile.am index e672fdb..d99633f 100644 --- a/clients/examples/Makefile.am +++ b/clients/examples/Makefile.am @@ -1,2 +1,7 @@ -bin_SCRIPTS = fortune.pl iosock.pl tail.pl x11amp.pl -EXTRA_DIST = fortune.pl iosock.pl tail.pl x11amp.pl +## Process this file with automake to produce Makefile.in + +bin_SCRIPTS = fortune.pl iosock.pl tail.pl x11amp.pl + +EXTRA_DIST = fortune.pl iosock.pl tail.pl x11amp.pl + +## EOF diff --git a/clients/headlines/Makefile.am b/clients/headlines/Makefile.am index d2cc1b0..d1107f7 100644 --- a/clients/headlines/Makefile.am +++ b/clients/headlines/Makefile.am @@ -1,2 +1,7 @@ +## Process this file with automake to produce Makefile.in + bin_SCRIPTS = lcdheadlines + EXTRA_DIST = lcdheadlines + +## EOF diff --git a/clients/lcdexec/Makefile.am b/clients/lcdexec/Makefile.am index 6bc5454..6228c06 100644 --- a/clients/lcdexec/Makefile.am +++ b/clients/lcdexec/Makefile.am @@ -1,4 +1,11 @@ +## Process this file with automake to produce Makefile.in + bin_PROGRAMS = lcdexec + lcdexec_SOURCES = lcdexec.c menu.c menu.h + lcdexec_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a -INCLUDES = -I$(top_srcdir) + +AM_CPPFLAGS = -I$(top_srcdir) + +## EOF diff --git a/clients/lcdproc/Makefile.am b/clients/lcdproc/Makefile.am index 6bf49a9..710b169 100644 --- a/clients/lcdproc/Makefile.am +++ b/clients/lcdproc/Makefile.am @@ -1,4 +1,11 @@ +## Process this file with automake to produce Makefile.in + bin_PROGRAMS = lcdproc + lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_SunOS.c util.c util.h + lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a -INCLUDES = -I$(top_srcdir) + +AM_CPPFLAGS = -I$(top_srcdir) + +## EOF diff --git a/clients/metar/Makefile.am b/clients/metar/Makefile.am index e79f1cb..fbc23d6 100644 --- a/clients/metar/Makefile.am +++ b/clients/metar/Makefile.am @@ -1,2 +1,7 @@ +## Process this file with automake to produce Makefile.in + bin_SCRIPTS = lcdmetar.pl + EXTRA_DIST = lcdmetar.pl + +## EOF diff --git a/configure.in b/configure.in index f72706c..ddb473a 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf 2.50 (or higher) to produce a configure scr AC_PREREQ(2.59) AC_INIT(lcdproc, 0.5dev, lcdproc@lists.omnipotent.net) AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(1.7) AC_CONFIG_HEADERS(config.h) diff --git a/docs/Makefile.am b/docs/Makefile.am index 4213a4c..da31ea3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,3 +1,5 @@ +## Process this file with automake to produce Makefile.in + man_MANS = lcdproc.1 lcdexec.1 LCDd.8 SUBDIRS = lcdproc-user lcdproc-dev doxygen_input = header.html footer.html @@ -64,3 +66,5 @@ pdf: @PACKAGE@.pdf clean-local: rm -f -r latex rm -f -r html man @PACKAGE@.ps @PACKAGE@.pdf + +## EOF diff --git a/docs/lcdproc-dev/Makefile.am b/docs/lcdproc-dev/Makefile.am index 9abdf36..bd0d4a8 100644 --- a/docs/lcdproc-dev/Makefile.am +++ b/docs/lcdproc-dev/Makefile.am @@ -1 +1,5 @@ -EXTRA_DIST = lcdproc-dev.docbook bookinfo.docbook introduction.docbook shared-files.docbook make-driver.docbook add-your-driver.docbook license.docbook +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = lcdproc-dev.docbook bookinfo.docbook introduction.docbook shared-files.docbook make-driver.docbook add-your-driver.docbook license.docbook + +## EOF diff --git a/docs/lcdproc-user/Makefile.am b/docs/lcdproc-user/Makefile.am index e1ff44c..a06d3fa 100644 --- a/docs/lcdproc-user/Makefile.am +++ b/docs/lcdproc-user/Makefile.am @@ -1,2 +1,7 @@ +## Process this file with automake to produce Makefile.in + SUBDIRS = drivers + EXTRA_DIST = bookinfo.docbook configuration.docbook contact.docbook drivers.docbook how-to-obtain.docbook installation.docbook introduction.docbook lcdproc-user.docbook license.docbook README.docbook running.docbook + +## EOF diff --git a/docs/lcdproc-user/drivers/Makefile.am b/docs/lcdproc-user/drivers/Makefile.am index e8d6f1c..2e19446 100644 --- a/docs/lcdproc-user/drivers/Makefile.am +++ b/docs/lcdproc-user/drivers/Makefile.am @@ -1 +1,5 @@ +## Process this file with automake to produce Makefile.in + EXTRA_DIST = hd44780.docbook lircin.docbook mtxorb.docbook ppttrouble.docbook t6963.docbook + +## EOF diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 06934a8..6cab50a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1 +1,5 @@ +## Process this file with automake to produce Makefile.in + EXTRA_DIST = init-LCDd.debian.in init-LCDd.rpm.in init-lcdproc.debian.in init-lcdproc.rpm.in lcdproc.conf + +## EOF diff --git a/server/Makefile.am b/server/Makefile.am index acd6a32..49257f7 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,6 +1,15 @@ +## Process this file with automake to produce Makefile.in + SUBDIRS=drivers commands + sbin_PROGRAMS=LCDd + LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h + LCDd_LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a + LCDd_LDFLAGS = -rdynamic -uget_args -INCLUDES = -I$(top_srcdir) + +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared + +## EOF diff --git a/server/commands/Makefile.am b/server/commands/Makefile.am index b4a2c73..2399eca 100644 --- a/server/commands/Makefile.am +++ b/server/commands/Makefile.am @@ -1,3 +1,9 @@ +## Process this file with automake to produce Makefile.in + noinst_LIBRARIES = libLCDcommands.a + libLCDcommands_a_SOURCES = command_list.c command_list.h client_commands.c client_commands.h menu_commands.c menu_commands.h screen_commands.c screen_commands.h server_commands.c server_commands.h widget_commands.c widget_commands.h -INCLUDES = -I$(top_srcdir) -I$(srcdir)/.. + +AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/.. + +## EOF diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index 829fa02..e80798e 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -1,9 +1,10 @@ +## Process this file with automake to produce Makefile.in + ## We use bin_ to generate the shared libraries, because automake only ## supports libtool shared libraries. But we don't want to use libtool... ## ## configure replaces all occurrences of so to the appropriate extension ## (without dot!) -## ## Fill in loadable module extension EXEEXT = @SO@ @@ -80,5 +81,6 @@ tyan_SOURCES = lcd.h tyan_lcdm.h tyan_lcdm.c report.h wirz_sli_SOURCES = lcd.h wirz-sli.h wirz-sli.c report.h xosd_SOURCES = lcd.h xosdlib_drv.c xosdlib_drv.h report.h -INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) +## EOF diff --git a/shared/Makefile.am b/shared/Makefile.am index 5171f72..03c0808 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -1,6 +1,13 @@ +## Process this file with automake to produce Makefile.in + noinst_LIBRARIES = libLCDstuff.a + libLCDstuff_a_SOURCES = LL.c LL.h sockets.c sockets.h str.c str.h configfile.c configfile.h debug.h report.c report.h snprintf.c snprintf.h fileio.c fileio.h -INCLUDES = @ldap_includes@ -I$(top_srcdir) +libLCDstuff_a_LIBADD = @LIBOBJS@ + +AM_CPPFLAGS = @ldap_includes@ -I$(top_srcdir) EXTRA_DIST = Makefile.in + +## EOF