update to xcmsdb 1.0.2

1 files changed, 36 insertions, 42 deletions

diff --git a/app/xcmsdb/Makefile.in b/app/xcmsdb/Makefile.in
index f0c07a7c4..89a8d6b99 100644
--- a/app/xcmsdb/Makefile.in
+++ b/app/xcmsdb/Makefile.in
@@ -62,8 +62,7 @@ bin_PROGRAMS = xcmsdb$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing \
-	mkinstalldirs
+	config.guess config.sub depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -71,13 +70,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_xcmsdb_OBJECTS = xcmsdb-loadData.$(OBJEXT) xcmsdb-xcmsdb.$(OBJEXT)
+am_xcmsdb_OBJECTS = loadData.$(OBJEXT) xcmsdb.$(OBJEXT)
 xcmsdb_OBJECTS = $(am_xcmsdb_OBJECTS)
 am__DEPENDENCIES_1 =
 xcmsdb_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -110,7 +109,6 @@ am__remove_distdir = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -126,7 +124,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -135,9 +136,11 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -170,8 +173,6 @@ VERSION = @VERSION@
 XCMSDB_CFLAGS = @XCMSDB_CFLAGS@
 XCMSDB_LIBS = @XCMSDB_LIBS@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -186,28 +187,36 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-xcmsdb_CFLAGS = $(XCMSDB_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XCMSDB_CFLAGS)
 xcmsdb_LDADD = $(XCMSDB_LIBS)
 xcmsdb_SOURCES = \
         loadData.c \
@@ -217,7 +226,8 @@ xcmsdb_SOURCES = \
 appman_PRE = \
         xcmsdb.man
 
-EXTRA_DIST = datafiles/sample1.dcc datafiles/sample2.dcc $(appman_PRE)
+EXTRA_DIST = datafiles/sample1.dcc datafiles/sample2.dcc $(appman_PRE) \
+	ChangeLog
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 CLEANFILES = $(appman_DATA)
@@ -240,6 +250,7 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -328,8 +339,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcmsdb-loadData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcmsdb-xcmsdb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcmsdb.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -344,34 +355,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-xcmsdb-loadData.o: loadData.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -MT xcmsdb-loadData.o -MD -MP -MF "$(DEPDIR)/xcmsdb-loadData.Tpo" -c -o xcmsdb-loadData.o `test -f 'loadData.c' || echo '$(srcdir)/'`loadData.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xcmsdb-loadData.Tpo" "$(DEPDIR)/xcmsdb-loadData.Po"; else rm -f "$(DEPDIR)/xcmsdb-loadData.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loadData.c' object='xcmsdb-loadData.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -c -o xcmsdb-loadData.o `test -f 'loadData.c' || echo '$(srcdir)/'`loadData.c
-
-xcmsdb-loadData.obj: loadData.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -MT xcmsdb-loadData.obj -MD -MP -MF "$(DEPDIR)/xcmsdb-loadData.Tpo" -c -o xcmsdb-loadData.obj `if test -f 'loadData.c'; then $(CYGPATH_W) 'loadData.c'; else $(CYGPATH_W) '$(srcdir)/loadData.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xcmsdb-loadData.Tpo" "$(DEPDIR)/xcmsdb-loadData.Po"; else rm -f "$(DEPDIR)/xcmsdb-loadData.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='loadData.c' object='xcmsdb-loadData.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -c -o xcmsdb-loadData.obj `if test -f 'loadData.c'; then $(CYGPATH_W) 'loadData.c'; else $(CYGPATH_W) '$(srcdir)/loadData.c'; fi`
-
-xcmsdb-xcmsdb.o: xcmsdb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -MT xcmsdb-xcmsdb.o -MD -MP -MF "$(DEPDIR)/xcmsdb-xcmsdb.Tpo" -c -o xcmsdb-xcmsdb.o `test -f 'xcmsdb.c' || echo '$(srcdir)/'`xcmsdb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xcmsdb-xcmsdb.Tpo" "$(DEPDIR)/xcmsdb-xcmsdb.Po"; else rm -f "$(DEPDIR)/xcmsdb-xcmsdb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xcmsdb.c' object='xcmsdb-xcmsdb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -c -o xcmsdb-xcmsdb.o `test -f 'xcmsdb.c' || echo '$(srcdir)/'`xcmsdb.c
-
-xcmsdb-xcmsdb.obj: xcmsdb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -MT xcmsdb-xcmsdb.obj -MD -MP -MF "$(DEPDIR)/xcmsdb-xcmsdb.Tpo" -c -o xcmsdb-xcmsdb.obj `if test -f 'xcmsdb.c'; then $(CYGPATH_W) 'xcmsdb.c'; else $(CYGPATH_W) '$(srcdir)/xcmsdb.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xcmsdb-xcmsdb.Tpo" "$(DEPDIR)/xcmsdb-xcmsdb.Po"; else rm -f "$(DEPDIR)/xcmsdb-xcmsdb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xcmsdb.c' object='xcmsdb-xcmsdb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcmsdb_CFLAGS) $(CFLAGS) -c -o xcmsdb-xcmsdb.obj `if test -f 'xcmsdb.c'; then $(CYGPATH_W) 'xcmsdb.c'; else $(CYGPATH_W) '$(srcdir)/xcmsdb.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
@@ -469,6 +452,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -598,6 +584,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -653,8 +640,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-binPROGRAMS install-data \
@@ -668,7 +655,14 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: