diff options
| author | Thomas Osterried <thomas@osterried.de> | 2005-10-31 02:48:48 +0000 |
|---|---|---|
| committer | Thomas Osterried <thomas@osterried.de> | 2005-10-31 02:48:48 +0000 |
| commit | c331fdd1d6927e7323b01fa2a9c115703f327d6a (patch) | |
| tree | 8874093d9d8df0a22ee15453db8729af8d9a7ce9 | |
| parent | d2e3fc8b9283d5bee1ff4100496387c46e80ed8b (diff) | |
q&d bugfix. but now compiles ;)
| -rw-r--r-- | hdlcutil/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 |