]> git.eshelyaron.com Git - emacs.git/commitdiff
($(OLDXMENU) rules): Fix conditionals so no rules are defined when !HAVE_MENUS.
authorRoland McGrath <roland@gnu.org>
Fri, 12 Jan 1996 19:52:53 +0000 (19:52 +0000)
committerRoland McGrath <roland@gnu.org>
Fri, 12 Jan 1996 19:52:53 +0000 (19:52 +0000)
src/Makefile.in

index 94817d280f48b5be896b2d1b02e4dad8b91c886b..9f2381c79f1255382e748a13f1ab22a58b11c502 100644 (file)
@@ -803,8 +803,8 @@ shortnames:
 #define LWLIB_OPTIONS
 #endif
 
-#ifdef HAVE_X_WINDOWS
-#ifdef HAVE_X11
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
 
@@ -828,7 +828,6 @@ really-lwlib:
        @true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
 #else /* not USE_X_TOOLKIT */
-#ifdef HAVE_MENUS
 $(OLDXMENU): really-oldXMenu
 
 /* Encode the values of these two macros in Make variables,
@@ -850,10 +849,8 @@ really-oldXMenu:
     "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
        @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
-#endif /* HAVE_MENUS */
 #endif /* not USE_X_TOOLKIT */
-#endif /* HAVE_X11 */
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS */
 
 paths.h: paths.in
        @echo "The file paths.h needs to be set up from paths.in."