aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--externals/Makefile28
-rw-r--r--externals/build/src/dist_normal.c1
-rw-r--r--externals/build/src/random1.c1
-rw-r--r--externals/build/src/random_fl.c1
-rw-r--r--externals/build/src/random_icg.c1
-rw-r--r--externals/build/src/random_tw.c1
6 files changed, 6 insertions, 27 deletions
diff --git a/externals/Makefile b/externals/Makefile
index a31577ae..43752a55 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -412,30 +412,14 @@ creb_clean:
#------------------------------------------------------------------------------#
# CXC
-CXC_NAME=cxc
-CXC_OBJECTS := $(wildcard $(externals_src)/cxc/???*.c)
-cxc: $(CXC_OBJECTS:.c=.$(EXTENSION))
-
-cxc_install: cxc
- install -d $(DESTDIR)$(objectsdir)/$(CXC_NAME)
- $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(CXC_NAME) \
- --author "jdl@xdv.org" \
- --description "" \
- --license "" \
- --version ""
- install -p $(CXC_OBJECTS:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(CXC_NAME)
- install -p $(wildcard $(externals_src)/cxc/reference/*.pd) \
- $(DESTDIR)$(objectsdir)/$(CXC_NAME)
-# install -d $(DESTDIR)$(manualsdir)/$(CXC_NAME)
- install -d $(DESTDIR)$(readmesdir)
- install -p $(externals_src)/cxc/README \
- $(DESTDIR)$(readmesdir)/$(CXC_NAME).txt
+cxc:
+ make -C $(externals_src)/cxc
+
+cxc_install:
+ make -C $(externals_src)/cxc DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
cxc_clean:
- -rm -f -- $(CXC_OBJECTS:.c=.$(EXTENSION))
- -rm -f -- $(externals_src)/cxc/*.o
- -rm -f -- $(externals_src)/cxc/*.bak
- -rm -f -- $(externals_src)/cxc/*.*~
+ make -C $(externals_src)/cxc clean
#------------------------------------------------------------------------------#
diff --git a/externals/build/src/dist_normal.c b/externals/build/src/dist_normal.c
deleted file mode 100644
index a181c44c..00000000
--- a/externals/build/src/dist_normal.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../cxc/randomix.c"
diff --git a/externals/build/src/random1.c b/externals/build/src/random1.c
deleted file mode 100644
index a181c44c..00000000
--- a/externals/build/src/random1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../cxc/randomix.c"
diff --git a/externals/build/src/random_fl.c b/externals/build/src/random_fl.c
deleted file mode 100644
index a181c44c..00000000
--- a/externals/build/src/random_fl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../cxc/randomix.c"
diff --git a/externals/build/src/random_icg.c b/externals/build/src/random_icg.c
deleted file mode 100644
index a181c44c..00000000
--- a/externals/build/src/random_icg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../cxc/randomix.c"
diff --git a/externals/build/src/random_tw.c b/externals/build/src/random_tw.c
deleted file mode 100644
index a181c44c..00000000
--- a/externals/build/src/random_tw.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../cxc/randomix.c"