Update PUI to use ffi-curl

[sxemacs] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a5d3e0e..5651add 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ ETAGS = $(top_builddir)/lib-src/etags
 TAGS_DEPENDENCIES = $(ETAGS)
 
 EXTRA_DIST = autogen.sh sxemacs_version.m4
+EXTRA_DIST += configfsf.guess configfsf.sub
 
 REPORT_VARS=PATH LD_LIBRARY_PATH LIBRARY_PATH SHLIB_PATH DYLD_LIBRARY_PATH CC CPATH CPPFLAGS CFLAGS LDFLAGS INCLUDE_PATH C_INCLUDE_PATH SHELL GCC_EXEC_PREFIX COMPILER_PATH DEPENDENCIES_OUTPUT GNUTARGET LDEMULATION
 
@@ -54,6 +55,8 @@ sxe_subdirs += lib-src
 if DESCEND_MODULES
 sxe_subdirs += modules
 endif
+## Note that src and lisp are traversed twice on purpose
+## for use of the proper dumped emacs for the autoloads and tests
 sxe_subdirs += src lisp src lisp info etc tests
 
 SUBDIRS =
@@ -101,6 +104,10 @@ uninstall-hook:
 
 check-recursive: all-recursive
 
+distclean-local:
+       $(RM) $(builddir)/Installation
+       $(RM) $(builddir)/cpuid
+
 $(ETAGS):
        cd $(top_builddir)/lib-src
        $(MAKE) $(AM_MAKEFLAGS) etags
@@ -108,8 +115,8 @@ $(ETAGS):
 .PHONY: stage1 stage2 build-report time-build-report time-check beta
 ## Convenience target for SXEmacs beta testers
 beta:
-       $(MAKE) $(RECURSIVE_MAKE_ARGS) clean
-       $(MAKE) $(RECURSIVE_MAKE_ARGS) all
+       $(MAKE) $(AM_MAKEFLAGS) clean
+       $(MAKE) $(AM_MAKEFLAGS) all
        @ touch ,,build.done
 
 ## Convenience target for SXEmacs build reporters
@@ -129,23 +136,23 @@ env-report:
        echo RECURSIVE_MAKE_ARGS="${RECURSIVE_MAKE_ARGS}"  ) | tee -a ,,vars.out
 
 time-beta:
-       (time $(MAKE) $(RECURSIVE_MAKE_ARGS) beta )2>&1 | tee ,,beta.out
+       (time $(MAKE) $(AM_MAKEFLAGS) beta )2>&1 | tee ,,beta.out
 
 time-all:
-       time $(MAKE) $(RECURSIVE_MAKE_ARGS) all
+       time $(MAKE) $(AM_MAKEFLAGS) all
 
 time-check:
-       (time $(MAKE) $(RECURSIVE_MAKE_ARGS) check ) 2>&1 | tee ,,make-check.out
+       (time $(MAKE) $(AM_MAKEFLAGS) check ) 2>&1 | tee ,,make-check.out
 
 build-report: env-report
-       $(MAKE) $(RECURSIVE_MAKE_ARGS) beta 2>&1 | tee ,,beta.out
+       $(MAKE) $(AM_MAKEFLAGS) beta 2>&1 | tee ,,beta.out
        @ [ -f ,,build.done ] || exit 1
-       $(MAKE) $(RECURSIVE_MAKE_ARGS) check 2>&1 | tee ,,make-check.out
+       $(MAKE) -w $(MAKEFLAGS) check 2>&1 | tee ,,make-check.out
 
 time-build-report: env-report
-       (time $(MAKE) $(RECURSIVE_MAKE_ARGS) beta ) 2>&1 | tee ,,beta.out
+       $(MAKE) $(AM_MAKEFLAGS) time-beta
        @ [ -f ,,build.done ] || exit 1
-       (time $(MAKE) $(RECURSIVE_MAKE_ARGS) check ) 2>&1 | tee ,,make-check.out
+       $(MAKE) $(AM_MAKEFLAGS) time-check 
 
 stage1:
        @echo
@@ -162,9 +169,3 @@ stage2: stage1
 ### dont use staged build
 ##all: stage1 stage2
 
-
-distdir: dist-hook
-
-dist-hook:
-       @echo "The dist targets do not work. Please read the sppm info section 'Making releases'."
-       @exit 1