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
+++ /dev/null
-## This file is called GNUmakefile because Makefile is git ignored. Rename
-## when this is autoconf'd
-
-
-EMACS=../src/emacs
-ELPA=../../elpa
-
-
-DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
-
-## dependent on makefile
-all: pkg-all $(EMACS)
-
-check: cleanlog check-packages ert-summarize
-
-check-maybe: check-packages
-
-WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
-
-gnumakefile-inc.mk: ./admin/package-makefile.el
- $(EMACS) --batch --load admin/package-makefile.el \
- --funcall package-makefile
-
-include gnumakefile-inc.mk
-
-cleanlog:
- find . -name "*log" -exec rm -v {} \;
-
-clean: cleanlog
- find . -name "*pkg.el" -exec rm -v {} \;
- find . -name "*-autoloads.el" -exec rm -v {} \;
- find . -name "*elc" -exec rm -v {} \;
-
-
-.PHONY: check clean all
--- /dev/null
+### @configure_input@
+
+
+EMACS= ../src/emacs
+ELPA=../../elpa
+
+
+DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
+
+## dependent on makefile
+all: pkg-all $(EMACS)
+
+check: cleanlog check-packages ert-summarize
+
+check-maybe: check-packages
+
+WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
+
+gnumakefile-inc.mk: ./admin/package-makefile.el
+ $(EMACS) --batch --load admin/package-makefile.el \
+ --funcall package-makefile
+
+include makefile-inc.mk
+
+cleanlog:
+ find . -name "*log" -exec rm -v {} \;
+
+clean: cleanlog
+ find . -name "*pkg.el" -exec rm -v {} \;
+ find . -name "*-autoloads.el" -exec rm -v {} \;
+ find . -name "*elc" -exec rm -v {} \;
+
+
+.PHONY: check clean all
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.
(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