martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies

Browse Source 
to ${OLDXMENU}.
This commit is contained in:
Jan Djärv
2004-11-09 10:59:49 +00:00
parent a7a7ddf104
commit 16bf4e3264
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-11-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
to ${OLDXMENU}.
2004-11-09 Kim F. Storm <storm@cua.dk>
* process.c (Fmake_network_process): Remove kludge for interrupted
@@ -5,7 +10,7 @@
start over rather than sleeping and retry with same socket.
2004-11-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* .cvsignore: Add buildobj.lst.
* doc.c: New variable Vbuild_files.

6
src/Makefile.in
View File

@@ -962,7 +962,7 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h)
#define OLDXMENU_OPTIONS
#endif
#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
/* We use stamp-xmenu with these two deps
to both ensure that lwlib gets remade based on its dependencies
@@ -1018,12 +1018,12 @@ really-oldXMenu:
@true /* make -t should not create really-oldXMenu. */
.PHONY: really-oldXMenu
#endif /* not USE_X_TOOLKIT */
#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
/* We don\'t really need this, but satisfy the dependency. */
stamp-oldxmenu:
touch stamp-oldxmenu
#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
../config.status:: epaths.in
@echo "The file epaths.h needs to be set up from epaths.in."