summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-05-10 14:41:48 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-05-10 14:41:48 +0200
commit4fb18ffbddfb1c6e5b90e42e6bfcd79117597f90 (patch)
tree19a4868e1e75ffd77edae78eaeb8ff07e5ca790d
parenta4c6c18b3dc3ed11b3aca19df37ef094a19fe025 (diff)
Fix "Provide --without-fluid configure option" - cont'd (#725)
-rw-r--r--Makefile4
-rw-r--r--configure.ac4
-rw-r--r--test/Makefile5
3 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b3c114c88..c02de0972 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,6 @@ all: makeinclude fltk-config
echo "=== making $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
done
- for dir in $(FLUIDDIR); do\
- echo "=== making fluidtest ===";\
- (cd test; $(MAKE) $(MFLAGS) allfluid);\
- done
install: makeinclude
-mkdir -p $(DESTDIR)$(bindir)
diff --git a/configure.ac b/configure.ac
index ac4ab6cfb..47ed6a495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1770,7 +1770,9 @@ AS_CASE([$host_os], [mingw*], [
])
AS_IF([test x$enable_fluid != xno], [
- echo "Build fluid: Yes"
+ echo " Build fluid: YES"
+ ],[
+ echo " Build fluid: NO"
])
dnl
diff --git a/test/Makefile b/test/Makefile
index fc1c8a003..f1187caf5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -243,8 +243,9 @@ GLALL = \
unittests$(EXEEXT)
all: $(ALL) $(GLDEMOS)
-
-allfluid: $(ALLFLUID)
+ for dir in $(FLUIDDIR); do\
+ $(MAKE) $(MFLAGS) $(ALLFLUID);\
+ done
gldemos: $(GLALL)