* 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.

2 files changed, 25 insertions, 34 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a0583ac0ce2..a853b6fe917 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (TOOLKIT_DEFINES): Remove.
+        (LIBW): Use a bit less #if, remove left over OPEN_LOOK stuff.
+
 2008-04-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * Makefile.in (MAC_OBJ): Add mactoolbox.o.
@@ -159,7 +164,8 @@
 
 2008-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * character.c (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
+        * character.c (Fmultibyte_char_to_unibyte):
+        Return latin1 chars unchanged.
 
         * fileio.c (Fexpand_file_name): Refine last fix so `nm' is only
         relocated if it points to `name'.
diff --git a/src/Makefile.in b/src/Makefile.in
index 011a630f056..77e082d5f1f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,15 +240,6 @@ STARTFILES = START_FILES
 #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 @@ DBUS_OBJ = dbusbind.o
 
 /* 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 @@ LIBXMENU=
 #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