From 2299dddfa134ce3e55ee3a7fd2181f0e4ddff0bd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 21 Aug 2009 22:28:21 +0200 Subject: Imported Upstream version 4.4.0 --- Makefile.in | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index d13b00e..7bb4576 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,29 +50,33 @@ sbin_PROGRAMS = @ENABLE_OMLIBDBI_TRUE@am__append_8 = plugins/omlibdbi @ENABLE_PGSQL_TRUE@am__append_9 = plugins/ompgsql @ENABLE_SNMP_TRUE@am__append_10 = plugins/omsnmp -@ENABLE_IMTEMPLATE_TRUE@am__append_11 = plugins/imtemplate -@ENABLE_OMSTDOUT_TRUE@am__append_12 = plugins/omstdout -@ENABLE_OMTEMPLATE_TRUE@am__append_13 = plugins/omtemplate -@ENABLE_IMFILE_TRUE@am__append_14 = plugins/imfile -@ENABLE_IMDIAG_TRUE@am__append_15 = plugins/imdiag -@ENABLE_MAIL_TRUE@am__append_16 = plugins/ommail -@ENABLE_RFC3195_TRUE@am__append_17 = plugins/im3195 +@ENABLE_CUST1_TRUE@am__append_11 = plugins/cust1 +@ENABLE_IMTEMPLATE_TRUE@am__append_12 = plugins/imtemplate +@ENABLE_OMSTDOUT_TRUE@am__append_13 = plugins/omstdout +@ENABLE_OMTEMPLATE_TRUE@am__append_14 = plugins/omtemplate +@ENABLE_IMFILE_TRUE@am__append_15 = plugins/imfile +@ENABLE_IMDIAG_TRUE@am__append_16 = plugins/imdiag +@ENABLE_MAIL_TRUE@am__append_17 = plugins/ommail +@ENABLE_OMPROG_TRUE@am__append_18 = plugins/omprog +@ENABLE_RFC3195_TRUE@am__append_19 = plugins/im3195 +@ENABLE_ORACLE_TRUE@am__append_20 = plugins/omoracle subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/shave-libtool.in $(srcdir)/shave.in \ $(top_srcdir)/configure AUTHORS COPYING COPYING.LESSER \ ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \ install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = shave shave-libtool CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -162,9 +166,10 @@ DIST_SUBDIRS = doc runtime . plugins/immark plugins/imuxsock \ plugins/imtcp plugins/imudp plugins/omtesting tools \ plugins/imklog plugins/omgssapi plugins/imgssapi \ plugins/omrelp plugins/imrelp plugins/ommysql plugins/omlibdbi \ - plugins/ompgsql plugins/omsnmp plugins/imtemplate \ - plugins/omstdout plugins/omtemplate plugins/imfile \ - plugins/imdiag plugins/ommail plugins/im3195 tests + plugins/ompgsql plugins/omsnmp plugins/cust1 \ + plugins/imtemplate plugins/omstdout plugins/omtemplate \ + plugins/imfile plugins/imdiag plugins/ommail plugins/omprog \ + plugins/im3195 plugins/omoracle tests DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -203,6 +208,7 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -229,12 +235,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ +FC = @FC@ FFLAGS = @FFLAGS@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GSS_LIBS = @GSS_LIBS@ HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@ +HAVE_ORACLE_CONFIG = @HAVE_ORACLE_CONFIG@ HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -251,12 +259,16 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_LIBS = @MYSQL_LIBS@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ OBJEXT = @OBJEXT@ +ORACLE_CFLAGS = @ORACLE_CFLAGS@ +ORACLE_LIBS = @ORACLE_LIBS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -269,6 +281,7 @@ PGSQL_LIBS = @PGSQL_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PTHREADS_CFLAGS = @PTHREADS_CFLAGS@ PTHREADS_LIBS = @PTHREADS_LIBS@ +Q = @Q@ RANLIB = @RANLIB@ RELP_CFLAGS = @RELP_CFLAGS@ RELP_LIBS = @RELP_LIBS@ @@ -282,6 +295,7 @@ SNMP_CFLAGS = @SNMP_CFLAGS@ SNMP_LIBS = @SNMP_LIBS@ SOL_LIBS = @SOL_LIBS@ STRIP = @STRIP@ +V = @V@ VERSION = @VERSION@ ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ @@ -331,6 +345,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +shavedir = @shavedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -385,7 +400,8 @@ SUBDIRS = doc runtime . plugins/immark plugins/imuxsock plugins/imtcp \ $(am__append_7) $(am__append_8) $(am__append_9) \ $(am__append_10) $(am__append_11) $(am__append_12) \ $(am__append_13) $(am__append_14) $(am__append_15) \ - $(am__append_16) $(am__append_17) tests + $(am__append_16) $(am__append_17) $(am__append_18) \ + $(am__append_19) $(am__append_20) tests # make sure "make distcheck" tries to build all modules. This means that # a developer must always have an environment where every supporting library @@ -393,7 +409,7 @@ SUBDIRS = doc runtime . plugins/immark plugins/imuxsock plugins/imtcp \ # temporarily be removed below. The intent behind forcing everthing to compile # in a make distcheck is so that we detect code that accidently was not updated # when some global update happened. -DISTCHECK_CONFIGURE_FLAGS = --enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout +DISTCHECK_CONFIGURE_FLAGS = --enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave ACLOCAL_AMFLAGS = -I m4 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -451,6 +467,10 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +shave: $(top_builddir)/config.status $(srcdir)/shave.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" -- cgit v1.2.3