aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-10-07 09:54:22 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-10-07 09:54:22 +0000
commit16cb08a33c2ef31a545d22a5981ddce7055f033d (patch)
tree8ff689db6702cff4da45202a2a901d6f04082aef
parentdf4f70b90bbc9ee6ef23c81cb143d92c61e4d759 (diff)
don't include c-files (iemmatrix.c used to include iemmatrix_sources.c)
instead compile all c-files into objects and link them together svn path=/trunk/externals/iem/iemmatrix/; revision=3674
-rw-r--r--src/Makefile.in2
-rw-r--r--src/configure.ac8
-rw-r--r--src/iemmatrix.c2
3 files changed, 2 insertions, 10 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index a6e0e25..ae68ab0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -26,7 +26,7 @@ CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@
LIBS = @LIBS@
-SOURCES=$(sort $(filter %.c, $(wildcard mtx_*.c))) iemmatrix.c
+SOURCES=$(sort $(filter %.c, $(wildcard *.c)))
TARGETS = $(SOURCES:.c=.o)
all: $(LIBNAME)
diff --git a/src/configure.ac b/src/configure.ac
index 162b4f9..ff88fb1 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -15,7 +15,6 @@ AC_SUBST(IEMMATRIX_VERSION)
AC_SUBST(REFERENCEPATH)
AC_SUBST(PDLIBDIR)
AC_SUBST(INCLUDES)
-AC_SUBST(SOURCES)
AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)])
@@ -272,13 +271,6 @@ else
fi
fi
-echo "SOURCES = \\"> Make.source
-for i in `ls mtx_*.c iemmatrix.c`
-do
- echo " $i\\">> Make.source
-done
-echo >> Make.source
-
AC_OUTPUT(Makefile)
rm -f conftest.*
diff --git a/src/iemmatrix.c b/src/iemmatrix.c
index 8c7e1e2..f554663 100644
--- a/src/iemmatrix.c
+++ b/src/iemmatrix.c
@@ -13,7 +13,7 @@
*/
#include "iemmatrix.h"
-#include "iemmatrix_sources.c"
+void iemmatrix_sources_setup(void);
void iemmatrix_setup(){
post("");