aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-10-27 21:13:29 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-10-27 21:13:29 +0000
commit39c893ecbd5348154c6bb0de14f59779f7543a8d (patch)
tree6de050c468c8bce6b6582c2fc1c1282024fa1ada
parenta0e015b98f58f9edf5ce4f40bc3ac5a46e228dfc (diff)
better make-system
svn path=/trunk/externals/zexy/; revision=3775
-rw-r--r--src/Make.config28
-rw-r--r--src/Make.config.in28
-rw-r--r--src/Makefile (renamed from src/Makefile.in)37
-rw-r--r--src/configure.ac7
4 files changed, 65 insertions, 35 deletions
diff --git a/src/Make.config b/src/Make.config
new file mode 100644
index 0000000..2ad4bb5
--- /dev/null
+++ b/src/Make.config
@@ -0,0 +1,28 @@
+LIBNAME =zexy
+
+PREFIX =/usr/local/lib/pd
+
+INSTALL_BIN=$(PREFIX)/extra
+INSTALL_DOC=$(PREFIX)/extra/help-$(LIBNAME)
+
+EXT = pd_linux
+DEFS = -DZEXY_LIBRARY -DZ_WANT_LPT -DHAVE_PPDEV
+IFLAGS = -I.
+
+CC = gcc
+LD = gcc
+STRIP = strip
+STRIPFLAGS= --strip-unneeded
+
+AFLAGS =
+LFLAGS = -export_dynamic -shared
+WFLAGS =
+
+TARNAME = $(LIBNAME)-2.1.tgz
+
+# ICCFLAGS=-march=pentiumiii -axK
+Z_CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) -g -O2 -mms-bitfields -DPD $(CFLAGS)
+
+MAKEDEP_FLAGS = -MM
+
+LIBS = -lm -lc
diff --git a/src/Make.config.in b/src/Make.config.in
new file mode 100644
index 0000000..12277f2
--- /dev/null
+++ b/src/Make.config.in
@@ -0,0 +1,28 @@
+LIBNAME =@LIBNAME@
+
+PREFIX =@prefix@@PDLIBDIR@
+
+INSTALL_BIN=$(PREFIX)/extra
+INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME)
+
+EXT = @EXT@
+DEFS = @DFLAGS@
+IFLAGS = -I. @INCLUDES@
+
+CC = @CC@
+LD = @LD@
+STRIP = @STRIP@
+STRIPFLAGS= @STRIPFLAGS@
+
+AFLAGS =
+LFLAGS = @LFLAGS@
+WFLAGS =
+
+TARNAME = $(LIBNAME)-@ZEXY_VERSION@.tgz
+
+# ICCFLAGS=-march=pentiumiii -axK
+Z_CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@ -DPD $(CFLAGS)
+
+MAKEDEP_FLAGS = @MAKEDEP_FLAGS@
+
+LIBS = @LIBS@
diff --git a/src/Makefile.in b/src/Makefile
index 5488c44..dd2e799 100644
--- a/src/Makefile.in
+++ b/src/Makefile
@@ -1,34 +1,16 @@
-LIBNAME =@LIBNAME@
+default: all
-PREFIX =@prefix@@PDLIBDIR@
-
-INSTALL_BIN=$(PREFIX)/extra
-INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME)
-
-EXT = @EXT@
-DEFS = @DFLAGS@
-IFLAGS = -I. @INCLUDES@
+Make.config: Make.config.in configure
+ ./configure
-CC = @CC@
-LD = @LD@
-STRIP = @STRIP@
-STRIPFLAGS= @STRIPFLAGS@
-AFLAGS =
-LFLAGS = @LFLAGS@
-WFLAGS =
+configure: configure.ac
+ autoconf
-TARNAME = $(LIBNAME)-@ZEXY_VERSION@.tgz
+include Make.config
.SUFFIXES: .$(EXT)
-# ICCFLAGS=-march=pentiumiii -axK
-Z_CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@ -DPD $(CFLAGS)
-
-MAKEDEP_FLAGS = @MAKEDEP_FLAGS@
-
-LIBS = @LIBS@
-
SOURCES=$(sort $(filter %.c, $(wildcard *.c)))
TARGETS = $(SOURCES:.c=.o)
@@ -88,10 +70,3 @@ newmakefile:
$(CC) $(MAKEDEP_FLAGS) $(Z_CFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
-
-
-Makefile: Makefile.in configure
- ./configure
-
-configure: configure.ac
- autoconf \ No newline at end of file
diff --git a/src/configure.ac b/src/configure.ac
index 2ca7efc..95966c6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -305,7 +305,7 @@ dnl should it rather be @exec_prefix@ ???
fi
fi
-if test `uname | sed -e 's/^MINGW.*/NT/'` = NT;
+if test `uname | sed -e 's/^MINGW.*/NT/'` = NT ;
then
LD=gcc
INCLUDES="-I@prefix@/src"
@@ -397,7 +397,6 @@ else
echo "no (ignored)"
fi
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Make.config)
-rm -f conftest.*
-./makesource.sh
+#rm -f conftest.*