diff options
| author | Paul Eggert | 2012-09-02 07:26:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-02 07:26:47 -0700 |
| commit | c04889f8e34e69ed496fcaaab285eac34e96acc1 (patch) | |
| tree | 6a8d73793fc7eaf77a8488400ebe693ea48c9a5d | |
| parent | f278d339c9aea397620179bda2c396aaae073be1 (diff) | |
| download | emacs-c04889f8e34e69ed496fcaaab285eac34e96acc1.tar.gz emacs-c04889f8e34e69ed496fcaaab285eac34e96acc1.zip | |
* Makefile.in (gl-stamp): Don't scan $(SOME_MACHINE_OBJECTS)
when building globals.h, as the objects that are not built on
this host are not needed to compile C files on this host.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2ea13df1261..4986726d7c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-09-02 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * Makefile.in (gl-stamp): Don't scan $(SOME_MACHINE_OBJECTS) | ||
| 4 | when building globals.h, as the objects that are not built on | ||
| 5 | this host are not needed to compile C files on this host. | ||
| 6 | |||
| 1 | 2012-09-02 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2012-09-02 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * gtkutil.h: Remove prototype for x_wm_set_size_hint. | 9 | * gtkutil.h: Remove prototype for x_wm_set_size_hint. |
diff --git a/src/Makefile.in b/src/Makefile.in index a809216f095..fe4cff5d8cc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -448,7 +448,7 @@ GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) | |||
| 448 | 448 | ||
| 449 | gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) | 449 | gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) |
| 450 | @rm -f gl-tmp | 450 | @rm -f gl-tmp |
| 451 | $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp | 451 | $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl-tmp |
| 452 | $(srcdir)/../build-aux/move-if-change gl-tmp globals.h | 452 | $(srcdir)/../build-aux/move-if-change gl-tmp globals.h |
| 453 | echo timestamp > $@ | 453 | echo timestamp > $@ |
| 454 | 454 | ||