Mercurial > emacs
diff src/Makefile.in @ 94175:dfdc13740582
* configure.in: Define USE_LUCID/USE_MOTIF in config.h.
* lwlib/Makefile.in (TOOLKIT_DEFINES): Remove.
* src/Makefile.in (TOOLKIT_DEFINES): Remove.
(LIBW): Use a bit less #if, remove left over OPEN_LOOK stuff.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 18 Apr 2008 15:48:06 +0000 |
parents | 3af508d0bd74 |
children | ee6746b372f3 |
line wrap: on
line diff
--- a/src/Makefile.in Fri Apr 18 15:34:26 2008 +0000 +++ b/src/Makefile.in Fri Apr 18 15:48:06 2008 +0000 @@ -240,15 +240,6 @@ #endif /* not ORDINARY_LINK */ -#ifdef USE_X_TOOLKIT -#define USE_@X_TOOLKIT_TYPE@ -TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ -#else -#ifndef USE_GTK -TOOLKIT_DEFINES = -#endif -#endif - #ifdef HAVE_DBUS DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -268,7 +259,7 @@ /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@ -317,29 +308,23 @@ #endif /* not HAVE_MENUS */ #ifdef USE_X_TOOLKIT -#define @X_TOOLKIT_TYPE@ -#if defined (LUCID) || defined (ATHENA) -#if HAVE_XAW3D -LIBW= -lXaw3d -#else -LIBW= -lXaw -#endif -#endif -#ifdef MOTIF -#if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP) -#define LIB_MOTIF_EXTRA -lXp -#else -#define LIB_MOTIF_EXTRA -#endif -#ifdef LIB_MOTIF -LIBW= LIB_MOTIF LIB_MOTIF_EXTRA -#else -LIBW= -lXm LIB_MOTIF_EXTRA -#endif -#endif -#ifdef OPEN_LOOK -LIBW= -lXol -#endif +# define @X_TOOLKIT_TYPE@ +# if HAVE_XAW3D +LUCID_LIBW= -lXaw3d +# else +LUCID_LIBW= -lXaw +# endif +# if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP) +# define LIB_MOTIF_EXTRA -lXp +# else +# define LIB_MOTIF_EXTRA +# endif +# ifdef LIB_MOTIF +MOTIF_LIBW= LIB_MOTIF LIB_MOTIF_EXTRA +# else +MOTIF_LIBW= -lXm LIB_MOTIF_EXTRA +# endif +LIBW=$(@X_TOOLKIT_TYPE@_LIBW) #ifdef HAVE_X11XTR6 #ifdef NEED_LIBW