aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 2740cb96827..33af175870a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -281,7 +281,7 @@ TOOLKIT_DEFINES =
281 281
282/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 282/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
283 since it may have -I options that should override those two. */ 283 since it may have -I options that should override those two. */
284ALL_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} ${CFLAGS} 284ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE @RSVG_CFLAGS@ C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${CFLAGS}
285.c.o: 285.c.o:
286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
287 287
@@ -450,7 +450,7 @@ XFT_LIBS=@XFT_LIBS@
450/* LD_SWITCH_X_DEFAULT comes after everything else that specifies 450/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
451 options for where to find X libraries, but before those libraries. */ 451 options for where to find X libraries, but before those libraries. */
452X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT 452X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
453LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) 453LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM @RSVG_LIBS@ LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS)
454#else /* not HAVE_X11 */ 454#else /* not HAVE_X11 */
455LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM 455LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
456#endif /* not HAVE_X11 */ 456#endif /* not HAVE_X11 */