[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/integrated-elpa ac145ce 16/23: autoconf support
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/integrated-elpa ac145ce 16/23: autoconf support |
Date: |
Fri, 16 Sep 2016 20:34:16 +0000 (UTC) |
branch: feature/integrated-elpa
commit ac145ce66189fde2c697a7b64d3a1092784fd2e4
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
autoconf support
---
configure.ac | 4 ++--
packages/{GNUmakefile => Makefile.in} | 7 +++----
packages/README.org | 2 --
packages/admin/package-makefile.el | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index c94ecb6..2e75097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5361,12 +5361,12 @@ dnl This will work, but you get a config.status that is
not quite right
dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
dnl That doesn't have any obvious consequences for Emacs, but on the whole
dnl it seems better to just live with the duplication.
-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile
doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile
nextstep/Makefile nt/Makefile"
+SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile
doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile
nextstep/Makefile nt/Makefile packages/Makefile"
AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
- leim/Makefile nextstep/Makefile nt/Makefile])
+ leim/Makefile nextstep/Makefile nt/Makefile packages/Makefile])
dnl test/ is not present in release tarfiles.
opt_makefile=test/Makefile
diff --git a/packages/GNUmakefile b/packages/Makefile.in
similarity index 81%
rename from packages/GNUmakefile
rename to packages/Makefile.in
index a19d361..e944de8 100644
--- a/packages/GNUmakefile
+++ b/packages/Makefile.in
@@ -1,8 +1,7 @@
-## This file is called GNUmakefile because Makefile is git ignored. Rename
-## when this is autoconf'd
+### @configure_input@
-EMACS=../src/emacs
+EMACS= ../src/emacs
ELPA=../../elpa
@@ -21,7 +20,7 @@ gnumakefile-inc.mk: ./admin/package-makefile.el
$(EMACS) --batch --load admin/package-makefile.el \
--funcall package-makefile
-include gnumakefile-inc.mk
+include makefile-inc.mk
cleanlog:
find . -name "*log" -exec rm -v {} \;
diff --git a/packages/README.org b/packages/README.org
index 719b13d..9c5fa7b 100644
--- a/packages/README.org
+++ b/packages/README.org
@@ -49,8 +49,6 @@ disabled. Most of these do not have regular test file
locations at the moment.
There is no support for make install.
-There is no support for autoconf.
-
There is no support for info.
Files in the "admin" directory should probably be in the emacs-root admin.
diff --git a/packages/admin/package-makefile.el
b/packages/admin/package-makefile.el
index 2f0086b..3ea4eda 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -141,7 +141,7 @@
(with-temp-buffer
(insert
(package-makefile--1))
- (write-file "gnumakefile-inc.mk")))
+ (write-file "makefile-inc.mk")))
;; example: core/example/example-pkg.el
;; core/example/example-pkg.el
- [Emacs-diffs] feature/integrated-elpa 4f6df43 15/23: README added, (continued)
- [Emacs-diffs] feature/integrated-elpa 4f6df43 15/23: README added, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5a2fa7a 11/23: Lots of changes, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa d208ef5 13/23: Makefile generator for tests, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 2456488 09/23: Start to factor out, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5d0232b 19/23: Multifile packages now work, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa b2f34a4 20/23: ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa dad684e 10/23: Refactor new files, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 8b53bb8 14/23: Summarization happening and some ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into feature/integrated-elpa, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of ELPA env var, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa ac145ce 16/23: autoconf support,
Phillip Lord <=
- [Emacs-diffs] feature/integrated-elpa c1c7c63 01/23: Initial Support for ELPA packages in core, Phillip Lord, 2016/09/16