Permalink
Browse files

Split `acinclude.m4' into new subdir `m4'.

git-svn-id: https://svn.r-project.org/R/trunk@14138 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 409e8a9 commit 4d29d3ddccce51dc7617bee5a5bd5e067ae523ba hornik committed May 14, 2001
Showing with 1,537 additions and 1,478 deletions.
  1. +16 −5 Makefile.in
  2. +1 −0 configure.in
  3. +45 −0 m4/Makefile.in
  4. +1,159 −0 m4/R.m4
  5. +41 −0 m4/README
  6. +51 −0 m4/am-fixes.m4
  7. +35 −0 m4/gnome-gnorba-check.m4
  8. +33 −0 m4/gnome-orbit-check.m4
  9. +106 −0 m4/gnome.m4
  10. +50 −0 m4/libglade.m4
  11. +0 −1,473 acinclude.m4 → m4/libtool.m4
View
@@ -14,10 +14,10 @@ INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS FAQ NEWS RESOURCES THANKS
DISTFILES = $(INSTFILES) \
BUGS ChangeLog INSTALL ONEWS README VERSION Y2K \
Makeconf.in Makefile.in \
- acconfig.h acinclude.m4 aclocal.m4 \
+ acconfig.h aclocal.m4 \
config.site configure configure.in \
date-stamp
-SUBDIRS = tools afm doc etc share src tests
+SUBDIRS = m4 tools afm doc etc share src tests
GZIP = --best
@@ -30,12 +30,23 @@ Makeconf: $(srcdir)/Makeconf.in $(top_builddir)/config.status
@cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_DEPENDENCIES = \
+ configure.in \
+ m4/R.m4 \
+ m4/am-fixes.m4 \
+ m4/gnome-gnorba-check.m4 \
+ m4/gnome-orbit-check.m4 \
+ m4/gnome.m4 \
+ m4/libglade.m4 \
+ m4/libtool.m4
config.status: $(srcdir)/configure
@$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4)
@cd $(srcdir) && $(AUTOCONF)
-$(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(srcdir)/acinclude.m4
- @cd $(srcdir) && $(ACLOCAL)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_DEPENDENCIES)
+ @cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
LIBTOOL_DEPS = @LIBTOOL_DEPS@
libtool: $(LIBTOOL_DEPS)
View
@@ -964,6 +964,7 @@ AC_OUTPUT(Makeconf
etc/Makefile
etc/Makeconf
etc/Renviron
+ m4/Makefile
share/Makefile
src/Makefile
src/appl/Makefile
View
@@ -0,0 +1,45 @@
+#
+# ${R_HOME}/m4/Makefile
+
+VPATH = @srcdir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+top_builddir = ..
+subdir = m4
+
+include $(top_builddir)/Makeconf
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = Makefile.in README \
+ R.m4 \
+ am-fixes.m4 \
+ gnome-gnorba-check.m4 \
+ gnome-orbit-check.m4 \
+ gnome.m4 \
+ libglade.m4 \
+ libtool.m4
+
+all: Makefile R
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @cd $(top_builddir) && \
+ CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+ $(SHELL) ./config.status
+
+R: Makefile
+
+mostlyclean: clean
+clean:
+distclean: clean
+ @rm -f Makefile
+maintainer-clean: distclean
+
+install install-strip uninstall TAGS info dvi check:
+
+distdir: $(DISTFILES)
+ @for f in $(DISTFILES); do \
+ test -f $(distdir)/$${f} \
+ || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
+ || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
+ done
Oops, something went wrong.

0 comments on commit 4d29d3d

Please sign in to comment.