comparison src/Makefile.in @ 91367:c70e45a7acfd

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
author Miles Bader <miles@gnu.org>
date Wed, 30 Jan 2008 07:57:28 +0000
parents 8c86686b6fa4 4794ef0780fc
children 5afe9b1dcd05
comparison
equal deleted inserted replaced
91366:86f3a8f0a3a6 91367:c70e45a7acfd
1030 often contain options that have to do with using Emacs''s crt0, 1030 often contain options that have to do with using Emacs''s crt0,
1031 which are only good with temacs. */ 1031 which are only good with temacs. */
1032 prefix-args${EXEEXT}: prefix-args.c $(config_h) 1032 prefix-args${EXEEXT}: prefix-args.c $(config_h)
1033 $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args 1033 $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
1034 1034
1035 /* Do not lose if this was not defined. */
1036 #ifndef OLDXMENU_OPTIONS
1037 #define OLDXMENU_OPTIONS
1038 #endif
1039
1040 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) 1035 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
1041 1036
1042 /* We use stamp-xmenu with these two deps 1037 /* We use stamp-xmenu with these two deps
1043 to both ensure that lwlib gets remade based on its dependencies 1038 to both ensure that lwlib gets remade based on its dependencies
1044 in its own makefile, 1039 in its own makefile,
1080 C_SWITCH_SITE_1 = C_SWITCH_SITE 1075 C_SWITCH_SITE_1 = C_SWITCH_SITE
1081 C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE 1076 C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
1082 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE 1077 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
1083 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM 1078 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
1084 really-oldXMenu: 1079 really-oldXMenu:
1085 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} OLDXMENU_OPTIONS \ 1080 cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
1086 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ 1081 CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
1087 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ 1082 "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
1088 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ 1083 "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
1089 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ 1084 "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
1090 "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \ 1085 "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \