comparison src/Makefile.in @ 82780:3f5c280a2e60

(RSVG_LIBS, RSVG_CFLAGS): New variables. (ALL_CFLAGS): Use ${RSVG_CFLAGS} instead of @RSVG_CFLAGS@. (LIBX): Remove @RSVG_LIBS@. (LIBES): Add $(RSVG_LIBS).
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Thu, 23 Aug 2007 08:44:38 +0000
parents 2282e35e680f
children 27d11c1d4e46 b83d0dadb2a7
comparison
equal deleted inserted replaced
82779:93f5d4f57e4d 82780:3f5c280a2e60
279 -DHAVE_CONFIG_H is needed for some other files to take advantage of 279 -DHAVE_CONFIG_H is needed for some other files to take advantage of
280 the information in ``config.h''. */ 280 the information in ``config.h''. */
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. */
284 ALL_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} 284 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} ${CFLAGS}
285 .c.o: 285 .c.o:
286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
287 287
288 #ifndef LIBX10_MACHINE 288 #ifndef LIBX10_MACHINE
289 #define LIBX10_MACHINE 289 #define LIBX10_MACHINE
448 448
449 #ifdef HAVE_X11 449 #ifdef HAVE_X11
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. */
452 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT 452 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
453 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM @RSVG_LIBS@ LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) 453 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS)
454 #else /* not HAVE_X11 */ 454 #else /* not HAVE_X11 */
455 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM 455 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
456 #endif /* not HAVE_X11 */ 456 #endif /* not HAVE_X11 */
457 #else /* not HAVE_X_WINDOWS */ 457 #else /* not HAVE_X_WINDOWS */
458 #endif /* not HAVE_X_WINDOWS */ 458 #endif /* not HAVE_X_WINDOWS */
466 #endif /* not HAVE_GPM */ 466 #endif /* not HAVE_GPM */
467 467
468 468
469 LIBSOUND= @LIBSOUND@ 469 LIBSOUND= @LIBSOUND@
470 CFLAGS_SOUND= @CFLAGS_SOUND@ 470 CFLAGS_SOUND= @CFLAGS_SOUND@
471
472 RSVG_LIBS= @RSVG_LIBS@
473 RSVG_CFLAGS= @RSVG_CFLAGS@
471 474
472 #ifndef ORDINARY_LINK 475 #ifndef ORDINARY_LINK
473 /* Fix linking if compiled with GCC. */ 476 /* Fix linking if compiled with GCC. */
474 #ifdef __GNUC__ 477 #ifdef __GNUC__
475 478
944 947
945 /* Construct full set of libraries to be linked. 948 /* Construct full set of libraries to be linked.
946 Note that SunOS needs -lm to come before -lc; otherwise, you get 949 Note that SunOS needs -lm to come before -lc; otherwise, you get
947 duplicated symbols. If the standard libraries were compiled 950 duplicated symbols. If the standard libraries were compiled
948 with GCC, we might need gnulib again after them. */ 951 with GCC, we might need gnulib again after them. */
949 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM \ 952 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \
950 LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ 953 LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
951 LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ 954 LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \
952 $(GNULIB_VAR) 955 $(GNULIB_VAR)
953 956
954 /* Enable recompilation of certain other files depending on system type. */ 957 /* Enable recompilation of certain other files depending on system type. */