From c331fdd1d6927e7323b01fa2a9c115703f327d6a Mon Sep 17 00:00:00 2001
From: Thomas Osterried <thomas@osterried.de>
Date: Mon, 31 Oct 2005 02:48:48 +0000
Subject: 	q&d bugfix. but now compiles ;)

---
 hdlcutil/Makefile.am    | 4 +---
 hdlcutil/fl/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hdlcutil/Makefile.am b/hdlcutil/Makefile.am
index 19e06b5..a3592db 100644
--- a/hdlcutil/Makefile.am
+++ b/hdlcutil/Makefile.am
@@ -3,9 +3,7 @@ if HAVE_X
 X11_bin_programs = smdiag
 endif
 
-if HAVE_FLTK
-SUBDIRS = fl
-endif
+SUBDIRS = . fl
 
 bin_PROGRAMS = sethdlc smmixer $(X11_bin_programs)
 
diff --git a/hdlcutil/fl/Makefile.am b/hdlcutil/fl/Makefile.am
index e43e7c6..2596f93 100644
--- a/hdlcutil/fl/Makefile.am
+++ b/hdlcutil/fl/Makefile.am
@@ -4,8 +4,8 @@ sbin_PROGRAMS = xfsmmixer xfhdlcchpar xfhdlcst xfsmdiag
 endif
 
 INCLUDES = $(X_CFLAGS) -I..
-AM_LDFLAGS = $(X_LIBS) -lX11 $(FLTK_LIB)
-LDADD = hdrvcomm.o
+LDDADD = ../hdrvcomm.o
+AM_LDFLAGS = $(X_LIBS) -lX11 $(FLTK_LIB) $(LDDADD)
 
 xfsmmixer_SOURCES = xfsmmixer.cxx xfsmmixer_main.cxx xfsmmixer.h
 xfhdlcchpar_SOURCES = xfhdlcchpar.cxx xfhdlcchpar_main.cxx xfhdlcchpar.h
-- 
cgit v1.2.3