diff --git a/exposed/Makefile.am b/exposed/Makefile.am index bb80b3d..77b7dc2 100644 --- a/exposed/Makefile.am +++ b/exposed/Makefile.am @@ -21,14 +21,17 @@ libslvs_a_SOURCES = \ ../src/constrainteq.cpp \ ../src/system.cpp +CDemo_LDADD = + if HAVE_FLTK CDemo_SOURCES += ../src/fltk/fltkutil.cpp +CDemo_LDADD += $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS) endif if WIN32 CDemo_SOURCES += ../src/win32/w32util.cpp endif -CDemo_LDADD = -lslvs $(FLTK_LDSTATICFLAGS) +CDemo_LDADD += -lslvs EXTRA_DIST = \ DOC.txt \ diff --git a/src/Makefile.am b/src/Makefile.am index 22c17cb..add5439 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,7 +80,7 @@ solvespace_SOURCES += \ fltk/fltkmain.cpp \ fltk/fltkutil.cpp -solvespace_LDADD = $(FLTK_LDSTATICFLAGS) -lGLU $(LIBSPNAV_LIBS) +solvespace_LDADD = $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS) endif if WIN32