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

to ${OLDXMENU}.

diff --git a/src/ChangeLog b/src/ChangeLog
index bc7954f12d1014b2810cfcf9bada489e38f92cab..74903bd1a3ee0e63abe9b16c553d4b9c6ababe4b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-09  Jan Dj\e,Ad\e(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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
-
+       
        * .cvsignore: Add buildobj.lst.
 
        * doc.c: New variable Vbuild_files.

diff --git a/src/Makefile.in b/src/Makefile.in
index 48952f674bb48729c4c25c228b342243c12e8e3d..3fd63fe52511f23fb5a440487e7df240562abe45 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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."