* widget.c (update_wm_hints): Return if wmshell is null.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f60e70a..c0d1088 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,16 +264,9 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 # checked out from a VCS.
 SUBDIR = lib lib-src src lisp
 
-# test/automated/Makefile.in, if you have it (test/ is not in the release).
-OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
-
 # The subdir makefiles created by config.status.
-SUBDIR_MAKEFILES_IN = lib/Makefile.in lib-src/Makefile.in \
-  doc/emacs/Makefile.in doc/misc/Makefile.in doc/lispref/Makefile.in \
-  doc/lispintro/Makefile.in src/Makefile.in oldXMenu/Makefile.in \
-  lwlib/Makefile.in leim/Makefile.in lisp/Makefile.in $(OPT_MAKEFILES_IN)
-
-SUBDIR_MAKEFILES = $(SUBDIR_MAKEFILES_IN:.in=)
+SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
+SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
@@ -307,7 +300,7 @@ epaths-force: FRC
          -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
          -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&                \
-       ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
+       ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be built before leim.
 # "export PARALLEL=0" is for SGI's Make, to prevent it from
@@ -339,10 +332,15 @@ DOS_gnulib_comp.m4 = gl-comp.m4
 # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools
 # as per $(gnulib_srcdir)/DEPENDENCIES.
 GNULIB_MODULES = \
-  careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu \
-  ignore-value intprops lstat mktime readlink \
-  socklen stdarg stdio strftime strtoumax symlink sys_stat
+  alloca-opt \
+  careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \
+  dup2 \
+  filemode getloadavg getopt-gnu ignore-value intprops lstat \
+  mktime pthread_sigmask readlink \
+  socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
 GNULIB_TOOL_FLAGS = \
+ --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax \
+ --avoid=raise --avoid=threadlib \
  --conditional-dependencies --import --no-changelog --no-vc-files \
  --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)
@@ -354,7 +352,7 @@ sync-from-gnulib: $(gnulib_srcdir)
        cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
        cp \
          $(gnulib_srcdir)/build-aux/move-if-change \
-         $(srcdir)
+         $(srcdir)/build-aux
        cd $(srcdir) && autoreconf -i -I m4
 .PHONY: sync-from-gnulib
 
@@ -476,10 +474,10 @@ install-arch-dep: mkdir
            if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
            if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
            rm -fr share ) ; \
-         ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
-           rm -fr emacs ) ; \
-         ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
-           ln -sf ../libexec/* .) ; \
+         ( cd ${ns_appbindir} ; \
+           if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
+           rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
+           ln -sf ../libexec/* . ; fi ; fi ) ; \
        else true ; fi
 
 ## FIXME is the emacs-24* bit above really necessary and correct?
@@ -668,7 +666,7 @@ install-etc: mkdir
 ### Install LEIM files.  Although they are machine-independent, we
 ### have separate target here instead of including it in
 ### `install-arch-indep'.  People who extracted LEIM files after they
-### insalled Emacs itself can install only LEIM files by this target.
+### installed Emacs itself can install only LEIM files by this target.
 install-leim: leim/Makefile mkdir
        cd leim; $(MAKE) install
 
@@ -692,7 +690,7 @@ mkdir: FRC
        done ; \
        icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
        umask 022 ; \
-       $(srcdir)/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
+       $(srcdir)/build-aux/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
          $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
          $(DESTDIR)${datadir}/emacs/site-lisp \
@@ -862,13 +860,15 @@ extraclean:
 # The src subdir knows how to do the right thing
 # even when the build directory and source dir are different.
 TAGS tags: lib lib-src src
-       cd src; $(MAKE) tags
+       cd src; $(MAKE) $(MFLAGS) tags
 
 check:
        @if test ! -d test/automated; then \
-         echo "You do not seem to have the test/ directory."; exit 1; \
-       else true; fi
-       cd test/automated && $(MAKE) check
+         echo "You do not seem to have the test/ directory."; \
+         echo "Maybe you are using a release tarfile, rather than a repository checkout."; \
+       else \
+         cd test/automated && $(MAKE) $(MFLAGS) check; \
+       fi
 
 dist:
        cd ${srcdir}; ./make-dist