summaryrefslogtreecommitdiff
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-12 19:52:53 +0000
committerRoland McGrath <roland@gnu.org>1996-01-12 19:52:53 +0000
commit14275958580e908c5a638e3968db8fb341b62517 (patch)
tree02068e403c76407c0fb9d5505f869de2787d42d4 /src/Makefile.in
parent7bb62d068efe0d271b314ca0e3dac6be4870a55d (diff)
downloademacs-14275958580e908c5a638e3968db8fb341b62517.tar.gz
($(OLDXMENU) rules): Fix conditionals so no rules are defined when !HAVE_MENUS.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 94817d280f4..9f2381c79f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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."