require automake 1.7 in condifure.in; update all Makefile.am: add comments,

replace obsoleted INCLUDES by AM_CPPFLAGS
2006-01-16 19:36:58 +00:00
parent b24543aadf
commit aeffd250a1
17 changed files with 96 additions and 11 deletions
@@ -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	
@@ -1 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
 SUBDIRS = examples headlines lcdexec lcdproc metar
+
+## EOF
@@ -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
@@ -1,2 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
 bin_SCRIPTS = lcdheadlines
+
 EXTRA_DIST = lcdheadlines
+
+## EOF
@@ -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
@@ -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
@@ -1,2 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
 bin_SCRIPTS = lcdmetar.pl
+
 EXTRA_DIST = lcdmetar.pl
+
+## EOF
@@ -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)

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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