[Nagiosplug-checkins] nagiosplug/lib Makefile.am, 1.31, 1.32 alloca.c, 1.1, NONE alloca_.h, 1.1, NONE basename.c, 1.1, NONE c-strtod.c, 1.1, NONE c-strtod.h, 1.1, NONE c-strtold.c, 1.1, NONE cloexec.c, 1.2, NONE cloexec.h, 1.2, NONE creat-safer.c, 1.1, NONE dirname.h, 1.1, NONE dup-safer.c, 1.1, NONE error.c, 1.3, NONE error.h, 1.3, NONE exit.h, 1.2, NONE exitfail.c, 1.2, NONE exitfail.h, 1.2, NONE fcntl--.h, 1.1, NONE fcntl-safer.h, 1.1, NONE fd-safer.c, 1.1, NONE fsusage.c, 1.4, NONE fsusage.h, 1.3, NONE full-read.c, 1.2, NONE full-read.h, 1.2, NONE full-write.c, 1.2, NONE full-write.h, 1.2, NONE getloadavg.c, 1.3, NONE getopt.c, 1.3, NONE getopt1.c, 1.3, NONE getopt_.h, 1.1, NONE getopt_int.h, 1.1, NONE gettext.h, 1.3, NONE intprops.h, 1.1, NONE malloc.c, 1.3, NONE mountlist.c, 1.6, NONE mountlist.h, 1.3, NONE open-safer.c, 1.1, NONE pipe-safer.c, 1.1, NONE realloc.c, 1.3, NONE regcomp.c, 1.1, NONE regex.c, 1.1, NONE regex.h, 1.1, NONE regex_internal.c, 1.1, NONE regex_internal.h, 1.1, NONE regexec.c, 1.1, NONE safe-read.c, 1.2, NONE safe-read.h, 1.2, NONE safe-write.c, 1.2, NONE safe-write.h, 1.2, NONE snprintf.c, 1.2, NONE stdbool_.h, 1.2, NONE strcase.h, 1.1, NONE strtod.c, 1.3, NONE unistd--.h, 1.1, NONE unistd-safer.h, 1.1, NONE unlocked-io.h, 1.3, NONE xalloc-die.c, 1.1, NONE xalloc.h, 1.3, NONE xmalloc.c, 1.3, NONE xstrdup.c, 1.1, NONE

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/lib
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9154/lib

Modified Files:
	Makefile.am 
Removed Files:
	alloca.c alloca_.h basename.c c-strtod.c c-strtod.h 
	c-strtold.c cloexec.c cloexec.h creat-safer.c dirname.h 
	dup-safer.c error.c error.h exit.h exitfail.c exitfail.h 
	fcntl--.h fcntl-safer.h fd-safer.c fsusage.c fsusage.h 
	full-read.c full-read.h full-write.c full-write.h getloadavg.c 
	getopt.c getopt1.c getopt_.h getopt_int.h gettext.h intprops.h 
	malloc.c mountlist.c mountlist.h open-safer.c pipe-safer.c 
	realloc.c regcomp.c regex.c regex.h regex_internal.c 
	regex_internal.h regexec.c safe-read.c safe-read.h 
	safe-write.c safe-write.h snprintf.c stdbool_.h strcase.h 
	strtod.c unistd--.h unistd-safer.h unlocked-io.h xalloc-die.c 
	xalloc.h xmalloc.c xstrdup.c 
Log Message:
Sync with gnulib - lots of extraneous code removed in preference to GNU code


--- fd-safer.c DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/lib/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	3 Nov 2006 15:40:33 -0000	1.31
+++ Makefile.am	24 Jan 2007 22:46:56 -0000	1.32
@@ -2,85 +2,14 @@
 
 SUBDIRS = tests
 
-noinst_LIBRARIES = libcoreutils.a libnagiosplug.a
-
-# Will auto pick up fsusage.c mountlist.c
-libcoreutils_a_SOURCES = \
-  cloexec.c cloexec.h \
-  exit.h \
-  full-read.c full-read.h \
-  full-write.c full-write.h \
-  gettext.h \
-  safe-read.c safe-read.h \
-  safe-write.c safe-write.h strcase.h xalloc-die.c
-
-# intprops.h required for getloadavg.c
-# This needs to be an EXTRA_DIST because the m4s
-# that have AC_LIBSOURCES for intprops.h are not necessary and
-# the getloadavg m4 is an autoconf one, so doesn't
-# know about intprops.h. Confused? You will be!
-EXTRA_DIST = intprops.h
-
-other_coreutils_files = \
-  error.c error.h \
-  fsusage.c \
-  getloadavg.c \
-  malloc.c \
-  mountlist.c \
-  realloc.c \
-  strtod.c \
-  exitfail.c exitfail.h \
-  fsusage.h \
-  getopt.c getopt1.c \
-  mountlist.h \
-  unlocked-io.h \
-  xalloc.h \
-  xmalloc.c
-
+noinst_LIBRARIES = libnagiosplug.a
 
-libcoreutils_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libcoreutils_a_DEPENDENCIES = $(libcoreutils_a_LIBADD)
-lib_OBJECTS = $(libcoreutils_a_OBJECTS)
 
-libnagiosplug_a_SOURCES = snprintf.c utils_base.c utils_disk.c
-EXTRA_DIST += utils_base.h utils_disk.h
-
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
+libnagiosplug_a_SOURCES = utils_base.c utils_disk.c
+EXTRA_DIST = utils_base.h utils_disk.h
 
-print_coreutil_files:
-	@echo $(libcoreutils_a_SOURCES) $(other_coreutils_files) $(EXTRA_DIST)
+INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
 test:
 	cd tests && make test
 
-# Below are from coreutil's lib/Makefile.am
-BUILT_SOURCES = $(STDBOOL_H)
-EXTRA_DIST += stdbool_.h
-MOSTLYCLEANFILES = stdbool.h stdbool.ht
-# Create stdbool.h on systems that lack a working one.
-stdbool.h: stdbool_.h
-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t
-	mv $@t $@
-
-BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += alloca_.h
-
-# We need the following in order to create an <alloca.h> when the system
-# doesn't have one that works with the given compiler
-all-local $(lib_OBJECTS): $(ALLOCA_H)
-alloca.h: alloca_.h
-	cp $(srcdir)/alloca_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += alloca.h alloca.h-t
-
-BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt_int.h
-
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
-	cp $(srcdir)/getopt_.h $@-t 
-	mv $@-t $@ 
-MOSTLYCLEANFILES += getopt.h getopt.h-t
-

--- mountlist.h DELETED ---

--- unistd--.h DELETED ---

--- intprops.h DELETED ---

--- fcntl--.h DELETED ---

--- mountlist.c DELETED ---

--- dirname.h DELETED ---

--- basename.c DELETED ---

--- full-write.c DELETED ---

--- xalloc.h DELETED ---

--- open-safer.c DELETED ---

--- gettext.h DELETED ---

--- full-write.h DELETED ---

--- regexec.c DELETED ---

--- fcntl-safer.h DELETED ---

--- strcase.h DELETED ---

--- regex.c DELETED ---

--- strtod.c DELETED ---

--- regex.h DELETED ---

--- dup-safer.c DELETED ---

--- getopt_int.h DELETED ---

--- c-strtod.c DELETED ---

--- unlocked-io.h DELETED ---

--- getopt1.c DELETED ---

--- regex_internal.h DELETED ---

--- safe-read.c DELETED ---

--- xstrdup.c DELETED ---

--- c-strtod.h DELETED ---

--- safe-read.h DELETED ---

--- regex_internal.c DELETED ---

--- getloadavg.c DELETED ---

--- creat-safer.c DELETED ---

--- full-read.h DELETED ---

--- stdbool_.h DELETED ---

--- c-strtold.c DELETED ---

--- error.c DELETED ---

--- exitfail.c DELETED ---

--- full-read.c DELETED ---

--- xalloc-die.c DELETED ---

--- pipe-safer.c DELETED ---

--- getopt.c DELETED ---

--- malloc.c DELETED ---

--- getopt_.h DELETED ---

--- regcomp.c DELETED ---

--- error.h DELETED ---

--- exitfail.h DELETED ---

--- fsusage.h DELETED ---

--- xmalloc.c DELETED ---

--- snprintf.c DELETED ---

--- realloc.c DELETED ---

--- unistd-safer.h DELETED ---

--- fsusage.c DELETED ---

--- cloexec.h DELETED ---

--- safe-write.h DELETED ---

--- alloca_.h DELETED ---

--- exit.h DELETED ---

--- alloca.c DELETED ---

--- safe-write.c DELETED ---

--- cloexec.c DELETED ---