Update Automake

i-nex · Aug 20, 2016 · f033111 · f033111
1 parent 8cc8989
commit f033111
Show file tree

Hide file tree

Showing 10 changed files with 4,463 additions and 81 deletions.
diff --git a/I-Nex/ChangeLog b/I-Nex/ChangeLog
@@ -1,4 +1,4 @@
-* Mon Jun 23 2014 eloaders <eloaders@linux.pl> 0.6.6
+* Sat Aug 20 2016 eloaders <eloaders@linux.pl> 7.4.0
 
 * Tue Nov 05 2013 eloaders <eloaders@yahoo.com> 0.5.6
 

diff --git a/I-Nex/Makefile.am b/I-Nex/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = $(PACKAGE)
 
 all:
 	@(if test "$(COMPONENT_build)" = "1"; then \
-	 echo "Building $(PACKAGE) component..."; \
+	 echo "Building $(COMPONENT_name) component..."; \
 	else \
 	 echo "Compiling $(PACKAGE) project..."; \
 	fi)
@@ -15,23 +15,23 @@ install-exec-local:
 	if test "$(COMPONENT_build)" = "1"; then \
 	 echo "Installing $(PACKAGE).gambas in $(GBLIBRARY_path)"; \
 	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
-	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)/$(GBLIBRARY_path); \
+	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).gambas; \
 	 echo "Installing $(PACKAGE).component in $(GBLIBRARY_path)"; \
 	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
-	 $(INSTALL) .component $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 chmod a-x $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
+	 $(INSTALL) .component $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
+	 chmod a-x $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
 	 echo "Installing $(PACKAGE).info in $(GBINFO_path)"; \
-	 $(INSTALL) -d .info $(DESTDIR)/$(GBINFO_path); \
-	 $(INSTALL) .info $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
-	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
+	 $(INSTALL) -d $(DESTDIR)/$(GBINFO_path); \
+	 $(INSTALL) .info $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
 	 echo "Installing $(PACKAGE).list in $(GBINFO_path)"; \
-	 $(INSTALL) .list $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
-	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
+	 $(INSTALL) .list $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
 	 if test -d .hidden/control; then \
 	  echo "Installing controls in $(GBCONTROL_path)"; \
-	  $(INSTALL) -d $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
-	  $(INSTALL) .hidden/control/*.png $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
-	  chmod a-x $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE)/*.png; \
+	  $(INSTALL) -d $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
+	  $(INSTALL) .hidden/control/*.png $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
+	  chmod a-x $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name)/*.png; \
 	 fi \
 	else \
 	 echo "Installing $(PACKAGE).gambas file in $(bindir)..."; \
@@ -41,12 +41,12 @@ install-exec-local:
 
 uninstall-local:
 	@(if test "$(COMPONENT_build)" = "1"; then \
-	 echo "Removing $(PACKAGE) component..."; \
-	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).gambas; \
-	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
-	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
-	 rm -rf $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
+	 echo "Removing $(COMPONENT_name) component..."; \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).gambas; \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
+	 rm -rf $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
 	else \
 	 echo "Removing $(PACKAGE).gambas file..."; \
 	 rm -f $(DESTDIR)$(bindir)/$(PACKAGE).gambas; \

diff --git a/I-Nex/Makefile.in b/I-Nex/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -76,15 +86,13 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) COPYING \
-	install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -110,6 +118,8 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS README install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -135,6 +145,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 COMPONENT_build = @COMPONENT_build@
+COMPONENT_name = @COMPONENT_name@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
@@ -197,6 +208,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -224,7 +236,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -309,15 +320,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -353,17 +364,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -535,10 +546,12 @@ uninstall-am: uninstall-local
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
 	uninstall uninstall-am uninstall-local
 
+.PRECIOUS: Makefile
+
 
 all:
 	@(if test "$(COMPONENT_build)" = "1"; then \
-	 echo "Building $(PACKAGE) component..."; \
+	 echo "Building $(COMPONENT_name) component..."; \
 	else \
 	 echo "Compiling $(PACKAGE) project..."; \
 	fi)
@@ -551,23 +564,23 @@ install-exec-local:
 	if test "$(COMPONENT_build)" = "1"; then \
 	 echo "Installing $(PACKAGE).gambas in $(GBLIBRARY_path)"; \
 	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
-	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)/$(GBLIBRARY_path); \
+	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).gambas; \
 	 echo "Installing $(PACKAGE).component in $(GBLIBRARY_path)"; \
 	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
-	 $(INSTALL) .component $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 chmod a-x $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
+	 $(INSTALL) .component $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
+	 chmod a-x $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
 	 echo "Installing $(PACKAGE).info in $(GBINFO_path)"; \
-	 $(INSTALL) -d .info $(DESTDIR)/$(GBINFO_path); \
-	 $(INSTALL) .info $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
-	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
+	 $(INSTALL) -d $(DESTDIR)/$(GBINFO_path); \
+	 $(INSTALL) .info $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
 	 echo "Installing $(PACKAGE).list in $(GBINFO_path)"; \
-	 $(INSTALL) .list $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
-	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
+	 $(INSTALL) .list $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
 	 if test -d .hidden/control; then \
 	  echo "Installing controls in $(GBCONTROL_path)"; \
-	  $(INSTALL) -d $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
-	  $(INSTALL) .hidden/control/*.png $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
-	  chmod a-x $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE)/*.png; \
+	  $(INSTALL) -d $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
+	  $(INSTALL) .hidden/control/*.png $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
+	  chmod a-x $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name)/*.png; \
 	 fi \
 	else \
 	 echo "Installing $(PACKAGE).gambas file in $(bindir)..."; \
@@ -577,12 +590,12 @@ install-exec-local:
 
 uninstall-local:
 	@(if test "$(COMPONENT_build)" = "1"; then \
-	 echo "Removing $(PACKAGE) component..."; \
-	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).gambas; \
-	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
-	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
-	 rm -rf $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
+	 echo "Removing $(COMPONENT_name) component..."; \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).gambas; \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(COMPONENT_name).component; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).info; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(COMPONENT_name).list; \
+	 rm -rf $(DESTDIR)/$(GBCONTROL_path)/$(COMPONENT_name); \
 	else \
 	 echo "Removing $(PACKAGE).gambas file..."; \
 	 rm -f $(DESTDIR)$(bindir)/$(PACKAGE).gambas; \

diff --git a/I-Nex/acinclude.m4 b/I-Nex/acinclude.m4
@@ -19,15 +19,20 @@ AC_DEFUN([GB_INIT_PROJECT],
     AC_MSG_ERROR(Cannot find .project file for $1 !)
   fi
 
-  AM_INIT_AUTOMAKE($1, `cat $1/.project | grep "^Version=" | sed s/"Version="//g`)
-  ##AM_INIT_AUTOMAKE($1, 7.0.0)
+  ##AM_INIT_AUTOMAKE($1, `cat $1/.project | grep "^Version=" | sed s/"Version="//g`)
+  AM_INIT_AUTOMAKE($1, 7.4.0)
 
   ## List of needed components
   COMPONENTS=`cat $1/.project | grep "^Component=" | sed s/"Component="//g`
 
   ## Check if the project is a component
   COMPONENT_build=`cat $1/.project | grep "^Type=Component" | sed s/"Type=Component"/1/g`
   AC_SUBST(COMPONENT_build)
+  
+  if test "$COMPONENT_build" = "1"; then
+    COMPONENT_name=$2
+    AC_SUBST(COMPONENT_name)
+  fi
 
   AC_MSG_CHECKING(for gambas3 binaries)
   GAMBAS_path=`gbx3 -e system.path`/bin