diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 76b4e70c7bc..75fc5532904 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-15 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-15 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (LIBX_OTHER): Always define. | ||
| 4 | |||
| 3 | * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. | 5 | * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. |
| 4 | (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. | 6 | (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. |
| 5 | 7 | ||
diff --git a/src/Makefile.in b/src/Makefile.in index ede7d722543..cfb057a4085 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -299,9 +299,10 @@ OLDXMENU=@OLDXMENU@ | |||
| 299 | LIBXMENU=@LIBXMENU@ | 299 | LIBXMENU=@LIBXMENU@ |
| 300 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) | 300 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) |
| 301 | LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) | 301 | LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) |
| 302 | LIBX_OTHER=@LIBX_OTHER@ | ||
| 303 | #endif /* HAVE_X_WINDOWS */ | 302 | #endif /* HAVE_X_WINDOWS */ |
| 304 | 303 | ||
| 304 | /* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */ | ||
| 305 | LIBX_OTHER=@LIBX_OTHER@ | ||
| 305 | 306 | ||
| 306 | /* A macro which other sections of Makefile can redefine to munge the | 307 | /* A macro which other sections of Makefile can redefine to munge the |
| 307 | flags before they are passed to LD. This is helpful if you have | 308 | flags before they are passed to LD. This is helpful if you have |