merge trunk

4 files changed, 61 insertions, 28 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 06417b3254f..64a73027915 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,28 @@
+2014-06-26  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (blessmail): Depend on lisp/mail/blessmail.el.
+        Use $<, $@.
+        (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}, ntlib.o)
+        (hexl${EXEEXT}, update-game-score${EXEEXT}, emacsclient.res): Use $<.
+        (ctags${EXEEXT}): Add $srcdir to dependency rather than using VPATH.
+
+2014-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Omit redundant extern decls.
+        * emacsclient.c (getenv): Remove decl.
+        * make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
+        Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
+
+2014-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LDFLAGS): Explicitly set via configure.
+
+2014-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (CPPFLAGS): Define.
+
 2014-06-15  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (../lib/libgnu.a):
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index eb3dc026c05..7eb13f667ec 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,7 +1,7 @@
 ### @configure_input@
 
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2014
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,6 +28,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp
 
 CC=@CC@
 CFLAGS=@CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+
 version=@version@
 ## Used in $archlibdir.
 configuration=@configuration@
@@ -192,6 +195,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
               -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
+## Unused.
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
@@ -207,9 +211,9 @@ $(EXE_FILES): ../lib/libgnu.a
 
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
-blessmail:
-        $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el
-        chmod +x blessmail
+blessmail: $(srcdir)/../lisp/mail/blessmail.el
+        $(EMACS) $(EMACSOPT) -l $<
+        chmod +x $@
 
 ## This checks if we need to run blessmail.
 ## Do not charge ahead and do it!  Let the installer decide.
@@ -307,7 +311,7 @@ TAGS: etags${EXEEXT}
         $(MAKE) -C ../lib libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-        ${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
+        ${CC} -c ${CPP_CFLAGS} $<
 
 
 etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
@@ -315,42 +319,41 @@ etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
 etags_libs = regex.o $(LOADLIBES) $(NTLIB)
 
 etags${EXEEXT}: ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/etags.c $(etags_libs)
+        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ## ctags.c is distinct from etags.c so that parallel makes do not write two
 ## etags.o files on top of each other.
 ## FIXME?
 ## Can't we use a wrapper that calls 'etags --ctags'?
-ctags${EXEEXT}: ctags.c ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/ctags.c $(etags_libs)
+ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
+        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
                    $(config_h)
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
-          ${srcdir}/ebrowse.c $(LOADLIBES) $(NTLIB) -o $@
+          $< $(LOADLIBES) $(NTLIB) -o $@
 
 profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
+        $(CC) ${ALL_CFLAGS} $< \
           $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@
 
 make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) $(NTLIB) \
-          -o $@
+        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
 
 movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
+        $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
           $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@
 
 pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
-        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
+        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
 
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
+        $(CC) ${ALL_CFLAGS} $< \
            -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
 emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
-        $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \
+        $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
            -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
@@ -362,18 +365,16 @@ NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \
 # The dependency on $(NTDEPS) is a trick intended to cause recompile of
 # programs on MinGW whenever some private header in nt/inc is modified.
 ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS)
-        $(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c
+        $(CC) -c ${CPP_CFLAGS} $<
 
 hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o $@
+        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
 
 update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
-          ${srcdir}/update-game-score.c $(LOADLIBES) $(NTLIB) \
-          -o $@
+          $< $(LOADLIBES) $(NTLIB) -o $@
 
 emacsclient.res: $(NTINC)/../emacsclient.rc
-        $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ \
-          $(NTINC)/../emacsclient.rc
+        $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
 
 ## Makefile ends here.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index a1177f54576..ddc1b6de5e3 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -82,10 +82,6 @@ char *w32_getenv (char *);
 #include <signal.h>
 #include <errno.h>
 
-
-
-char *getenv (const char *);
-
 #ifndef VERSION
 #define VERSION "unspecified"
 #endif
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 2eb2413815e..15ffa138b51 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -665,6 +665,7 @@ write_globals (void)
               || strcmp (globals[i].name, "Fexit_recursive_edit") == 0
               || strcmp (globals[i].name, "Fabort_recursive_edit") == 0)
             fprintf (outfile, "_Noreturn ");
+
           fprintf (outfile, "EXFUN (%s, ", globals[i].name);
           if (globals[i].value == -1)
             fprintf (outfile, "MANY");
@@ -672,7 +673,17 @@ write_globals (void)
             fprintf (outfile, "UNEVALLED");
           else
             fprintf (outfile, "%d", globals[i].value);
-          fprintf (outfile, ");\n");
+          fprintf (outfile, ")");
+
+          /* It would be nice to have a cleaner way to deal with these
+             special hacks, too.  */
+          if (strcmp (globals[i].name, "Fbyteorder") == 0
+              || strcmp (globals[i].name, "Ftool_bar_height") == 0
+              || strcmp (globals[i].name, "Fmax_char") == 0
+              || strcmp (globals[i].name, "Fidentity") == 0)
+            fprintf (outfile, " ATTRIBUTE_CONST");
+
+          fprintf (outfile, ";\n");
         }
 
       while (i + 1 < num_globals