diff options
| author | Richard M. Stallman | 1997-01-21 05:26:30 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-01-21 05:26:30 +0000 |
| commit | 084f76ff7ff28d6a111740a7c5ad197a91f15b52 (patch) | |
| tree | 51301775d2643fb8f6692c427ac119d2994eb3cb /src | |
| parent | e7017ef969390a58ba1ae53894804ed6755eced1 (diff) | |
| download | emacs-084f76ff7ff28d6a111740a7c5ad197a91f15b52.tar.gz emacs-084f76ff7ff28d6a111740a7c5ad197a91f15b52.zip | |
(stamp-oldxmenu): New target.
(temacs): Depend on stamp-oldxmenu, not on ${OLDXMENU}.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 15f87f643bc..cb13ecfc7fa 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -760,7 +760,7 @@ ${libsrc}make-docfile: | |||
| 760 | #define MAKE_PARALLEL | 760 | #define MAKE_PARALLEL |
| 761 | #endif | 761 | #endif |
| 762 | 762 | ||
| 763 | temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) $(OLDXMENU) ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args | 763 | temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args |
| 764 | $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ | 764 | $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ |
| 765 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ | 765 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ |
| 766 | OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} | 766 | OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} |
| @@ -807,6 +807,13 @@ shortnames: | |||
| 807 | 807 | ||
| 808 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) | 808 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) |
| 809 | 809 | ||
| 810 | /* We use stamp-xmenu with these two deps | ||
| 811 | to both ensure that lwlib gets remade based on its dependencies | ||
| 812 | in its own makefile, | ||
| 813 | and remake temacs if lwlib gets changed by this. */ | ||
| 814 | stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) | ||
| 815 | touch stamp-oldxmenu | ||
| 816 | |||
| 810 | #ifdef USE_X_TOOLKIT | 817 | #ifdef USE_X_TOOLKIT |
| 811 | $(OLDXMENU): really-lwlib | 818 | $(OLDXMENU): really-lwlib |
| 812 | 819 | ||