From c600fd4dca0076ecd49446a08ad0f116fa98d314 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 26 Nov 2002 17:00:34 +0000 Subject: [PATCH] using FbTk lib --- util/fbrun/Makefile.am | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am index a30108ef..64188096 100644 --- a/util/fbrun/Makefile.am +++ b/util/fbrun/Makefile.am @@ -1,17 +1,8 @@ FLUXBOX_SRC_DIR=../../src/ -INCLUDES = -I${FLUXBOX_SRC_DIR} +INCLUDES = -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk bin_PROGRAMS = fbrun fbrun_SOURCES = FbRun.hh FbRun.cc main.cc -if XFT -xft_OBJ = ${FLUXBOX_SRC_DIR}/XftFontImp.o -endif -if MULTIBYTE -xmb_OBJ = ${FLUXBOX_SRC_DIR}/XmbFontImp.o -endif +fbrun_LDADD = ${FLUXBOX_SRC_DIR}FbTk/.libs/libFbTk.a ${FLUXBOX_SRC_DIR}StringUtil.o + -fbrun_LDADD = ${FLUXBOX_SRC_DIR}Font.o ${FLUXBOX_SRC_DIR}StringUtil.o ${FLUXBOX_SRC_DIR}/Timer.o \ - ${FLUXBOX_SRC_DIR}/BaseDisplay.o ${FLUXBOX_SRC_DIR}/i18n.o \ - ${xft_OBJ} ${xmb_OBJ} ${FLUXBOX_SRC_DIR}/XFontImp.o - -fbrun.o: ${FLUXBOX_SRC_DIR}/Font.hh ${FLUXBOX_SRC_DIR}/BaseDisplay.hh