Fixed up Makefiles to actually work

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e56f0b2ebc4fe473de899fd97bcee8f1f16cd409..f8064a1d41721dbefd59b99f686d0d6495bc8aa4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,26 +1,29 @@
-EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in
-
-GENERATED_FILES = easydialog parseini tools vserver
+lib_SCRIPTS = easydialog parseini tools vserver

 
 

-dist_pkglib_DATA = $(GENERATED_FILES)
+CLEANFILES = $(lib_SCRIPTS)

 
 

-CLEANFILES = $(GENERATED_FILES)
+EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in

 
 edit = sed \
 
 edit = sed \

-    -e "s,@BASH\@,$(BASH),g"
-
-easydialog:
+    -e "s,@CFGDIR\@,$(CFGDIR),g" \
+    -e "s,@BASH\@,$(BASH),g" \
+    -e 's,@datadir\@,$(pkgdatadir),g' \
+    -e "s,@libdir\@,$(pkglibdir),g" \
+    -e 's,@localstatedir\@,$(localstatedir),g' \
+        -e 's,@prefix\@,$(prefix),g'
+
+easydialog: $(srcdir)/easydialog.in

        rm -f easydialog
        $(edit) easydialog.in > easydialog
 
        rm -f easydialog
        $(edit) easydialog.in > easydialog
 

-parseini:
+parseini: $(srcdir)/parseini.in

        rm -f parseini
        $(edit) parseini.in > parseini
 
        rm -f parseini
        $(edit) parseini.in > parseini
 

-tools:
+tools: $(srcdir)/tools.in

        rm -f tools
        $(edit) tools.in > tools
 
        rm -f tools
        $(edit) tools.in > tools
 

-vserver:
+vserver: $(srcdir)/vserver.in

        rm -f vserver
        $(edit) vserver.in > vserver
        rm -f vserver
        $(edit) vserver.in > vserver

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 13676a94b1c1a22d65184b6b31b1aef838001336..5434d60cd3d6da2411be21ee14d5cea6cb6dc7b2 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,6 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am

 
 

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.


@@ -12,300 +10,217 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 

-@SET_MAKE@
+
+SHELL = @SHELL@

 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@

+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+

 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@

+

 top_builddir = ..
 top_builddir = ..

-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+

 INSTALL = @INSTALL@
 INSTALL = @INSTALL@

-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+

 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :

-subdir = lib
-DIST_COMMON = $(dist_pkglib_DATA) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-dist_pkglibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_pkglib_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
+host_alias = @host_alias@
+host_triplet = @host@

 AWK = @AWK@
 BASH = @BASH@
 AWK = @AWK@
 BASH = @BASH@

+CC = @CC@

 CFGDIR = @CFGDIR@
 CFGDIR = @CFGDIR@

-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
+LTLIB = @LTLIB@

 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@

-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
+SED = @SED@

 VERSION = @VERSION@
 VERSION = @VERSION@

-ac_ct_STRIP = @ac_ct_STRIP@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
+
+lib_SCRIPTS = easydialog parseini tools vserver
+
+CLEANFILES = $(lib_SCRIPTS)
+

 EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in
 EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in

-GENERATED_FILES = easydialog parseini tools vserver
-dist_pkglib_DATA = $(GENERATED_FILES)
-CLEANFILES = $(GENERATED_FILES)
-edit = sed \
-    -e "s,@BASH\@,$(BASH),g"

 
 

-all: all-am
+edit = sed     -e "s,@CFGDIR\@,$(CFGDIR),g"     -e "s,@BASH\@,$(BASH),g"     -e 's,@datadir\@,$(pkgdatadir),g'     -e "s,@libdir\@,$(pkglibdir),g"     -e 's,@localstatedir\@,$(localstatedir),g'         -e 's,@prefix\@,$(prefix),g'
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+SCRIPTS =  $(lib_SCRIPTS)
+

 
 

+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect

 .SUFFIXES:
 .SUFFIXES:

-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  lib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-dist_pkglibDATA: $(dist_pkglib_DATA)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+install-libSCRIPTS: $(lib_SCRIPTS)

        @$(NORMAL_INSTALL)
        @$(NORMAL_INSTALL)

-       test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
-       @list='$(dist_pkglib_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(dist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-         $(dist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+       $(mkinstalldirs) $(DESTDIR)$(srcdir)/lib
+       @list='$(lib_SCRIPTS)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(srcdir)/lib/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(srcdir)/lib/`echo $$p|sed '$(transform)'`; \
+         else if test -f $(srcdir)/lib/$$p; then \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/lib/$$p $(DESTDIR)$(srcdir)/lib/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $(srcdir)/lib/$$p $(DESTDIR)$(srcdir)/lib/`echo $$p|sed '$(transform)'`; \
+         else :; fi; fi; \

        done
 
        done
 

-uninstall-dist_pkglibDATA:
+uninstall-libSCRIPTS:

        @$(NORMAL_UNINSTALL)
        @$(NORMAL_UNINSTALL)

-       @list='$(dist_pkglib_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+       list='$(lib_SCRIPTS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(srcdir)/lib/`echo $$p|sed '$(transform)'`; \

        done
 tags: TAGS
 TAGS:
 
        done
 tags: TAGS
 TAGS:
 

-ctags: CTAGS
-CTAGS:

 
 

+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib

 
 distdir: $(DISTFILES)
 
 distdir: $(DISTFILES)

-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       distdir=`cd $(distdir) && pwd`; \
+       cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile
+       @for file in $(DISTFILES); do \
+         d=$(srcdir); \

          if test -d $$d/$$file; then \
          if test -d $$d/$$file; then \

-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -pr $$d/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
          else \
            test -f $(distdir)/$$file \

-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
+           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+           || cp -p $$d/$$file $(distdir)/$$file || :; \

          fi; \
        done
          fi; \
        done

+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am

 check-am: all-am
 check: check-am
 check-am: all-am
 check: check-am

-all-am: Makefile $(DATA)
-installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
-install: install-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am: install-libSCRIPTS

 install-exec: install-exec-am
 install-exec: install-exec-am

+
+install-data-am:

 install-data: install-data-am
 install-data: install-data-am

-uninstall: uninstall-am

 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

-
-installcheck: installcheck-am
+install: install-am
+uninstall-am: uninstall-libSCRIPTS
+uninstall: uninstall-am
+all-am: Makefile $(SCRIPTS)
+all-redirect: all-am

 install-strip:
 install-strip:

-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+       $(mkinstalldirs)  $(DESTDIR)$(sbindir)
+
+

 mostlyclean-generic:
 
 clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 mostlyclean-generic:
 
 clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:

-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*

 
 maintainer-clean-generic:
 
 maintainer-clean-generic:

-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-dist_pkglibDATA
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean-am:  mostlyclean-generic

 
 mostlyclean: mostlyclean-am
 
 
 mostlyclean: mostlyclean-am
 

-mostlyclean-am: mostlyclean-generic
+clean-am:  clean-generic mostlyclean-am

 
 

-pdf: pdf-am
+clean: clean-am

 
 

-pdf-am:
+distclean-am:  distclean-generic clean-am

 
 

-ps: ps-am
+distclean: distclean-am

 
 

-ps-am:
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."

 
 

-uninstall-am: uninstall-dist_pkglibDATA uninstall-info-am
+maintainer-clean: maintainer-clean-am

 
 

-.PHONY: all all-am check check-am clean clean-generic distclean \
-       distclean-generic distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-dist_pkglibDATA install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-dist_pkglibDATA uninstall-info-am
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean

 
 
 
 

-easydialog:
+easydialog: $(srcdir)/easydialog.in

        rm -f easydialog
        $(edit) easydialog.in > easydialog
 
        rm -f easydialog
        $(edit) easydialog.in > easydialog
 

-parseini:
+parseini: $(srcdir)/parseini.in

        rm -f parseini
        $(edit) parseini.in > parseini
 
        rm -f parseini
        $(edit) parseini.in > parseini
 

-tools:
+tools: $(srcdir)/tools.in

        rm -f tools
        $(edit) tools.in > tools
 
        rm -f tools
        $(edit) tools.in > tools
 

-vserver:
+vserver: $(srcdir)/vserver.in

        rm -f vserver
        $(edit) vserver.in > vserver
        rm -f vserver
        $(edit) vserver.in > vserver

+

 # 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:
 # 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: