comparison src/Makefile.in.in @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents 0d2f883870bc
children a145efe76779
comparison
equal deleted inserted replaced
99:2d83cbd90d8d 100:4be1180a9e89
630 LIBX11_LIBS = -llw $(TOOLKIT_LIBS) $(XPM_LIBS) $(XFACE_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(USAGE_TRACKING_LIBS) 630 LIBX11_LIBS = -llw $(TOOLKIT_LIBS) $(XPM_LIBS) $(XFACE_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(USAGE_TRACKING_LIBS)
631 631
632 #ifdef AIX4 632 #ifdef AIX4
633 # define LIBI18N -li18n 633 # define LIBI18N -li18n
634 #else 634 #else
635 # if (defined(LINUX) && defined(HAVE_CDE)) 635 # define LIBI18N
636 # define LIBI18N -lXintl
637 # else
638 # define LIBI18N
639 #endif /* LINUX & CDE */
640 #endif /* AIX4 */ 636 #endif /* AIX4 */
637
638 #if (defined(LINUX) && defined(HAVE_CDE))
639 # define LIBX11_INTL -lXintl
640 #else
641 # define LIBX11_INTL
642 #endif
641 643
642 #ifdef THIS_IS_X11R6 644 #ifdef THIS_IS_X11R6
643 #ifdef NEED_LIBW 645 #ifdef NEED_LIBW
644 LIBW= -lw 646 LIBW= -lw
645 #else 647 #else
646 LIBW= 648 LIBW=
647 #endif 649 #endif
648 LIBX= $(LIBX11_LIBS) $(XMU_LIB) -lXt -lSM -lICE $(LIBW) -lXext -lX11 LIBX11_MACHINE LIBX11_SYSTEM LIBI18N 650 LIBX= $(LIBX11_LIBS) $(XMU_LIB) -lXt -lSM -lICE $(LIBW) -lXext LIBX11_INTL -lX11 LIBX11_MACHINE LIBX11_SYSTEM LIBI18N
649 #else 651 #else
650 LIBX= $(LIBX11_LIBS) $(XMU_LIB) -lXt -lXext -lX11 LIBX11_MACHINE LIBX11_SYSTEM LIBI18N 652 LIBX= $(LIBX11_LIBS) $(XMU_LIB) -lXt -lXext LIBX11_INTL -lX11 LIBX11_MACHINE LIBX11_SYSTEM LIBI18N
651 #endif 653 #endif
652 654
653 #else 655 #else
654 # define XOBJS 656 # define XOBJS
655 # define XMU_OBJS 657 # define XMU_OBJS
1265 ${lispdir}prim/isearch-mode.elc ${lispdir}prim/misc.elc \ 1267 ${lispdir}prim/isearch-mode.elc ${lispdir}prim/misc.elc \
1266 ${lispdir}packages/vc-hooks.elc \ 1268 ${lispdir}packages/vc-hooks.elc \
1267 ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc \ 1269 ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc \
1268 ${lispdir}modes/auto-show.elc SUNPRO_LISP TTY_LISP \ 1270 ${lispdir}modes/auto-show.elc SUNPRO_LISP TTY_LISP \
1269 ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP EPOCH_LISP \ 1271 ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP EPOCH_LISP \
1270 ${lispdir}prim/itimer.elc ${lispdir}ediff/ediff-hook.elc \ 1272 ${lispdir}prim/itimer.elc ${lispdir}prim/itimer-autosave.elc \
1271 ${lispdir}custom/custom.elc ${lispdir}custom/widget.elc \ 1273 ${lispdir}ediff/ediff-hook.elc \
1272 ${lispdir}w3/font.elc \ 1274 ${lispdir}custom/widget.elc \
1275 ${lispdir}custom/custom.elc ${lispdir}custom/custom-xmas.elc \
1273 ${lispdir}packages/fontl-hooks.elc SCROLLBAR_LISP \ 1276 ${lispdir}packages/fontl-hooks.elc SCROLLBAR_LISP \
1274 ${lispdir}prim/buffer.elc MENUBAR_LISP \ 1277 ${lispdir}prim/buffer.elc MENUBAR_LISP \
1275 ${lispdir}packages/buff-menu.elc DIALOG_LISP MULE_LISP NOMULE_LISP \ 1278 ${lispdir}packages/buff-menu.elc DIALOG_LISP MULE_LISP NOMULE_LISP \
1276 ${lispdir}modes/abbrev.elc X11_LISP NS_LISP ENERGIZE_LISP TOOLTALK_LISP 1279 ${lispdir}modes/abbrev.elc X11_LISP NS_LISP ENERGIZE_LISP TOOLTALK_LISP
1277 1280