From c4ce907beac0170a06a32c84ee851e4167ab2909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@users.sourceforge.net>
Date: Mon, 21 Jul 2008 13:44:43 +0000
Subject: more on the way to an autoconf-based "build"

svn path=/trunk/externals/zexy/; revision=10185
---
 build/autoconf/Makefile     | 24 ++++++------------------
 build/autoconf/configure.ac |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'build')

diff --git a/build/autoconf/Makefile b/build/autoconf/Makefile
index 86a472d..0c09294 100644
--- a/build/autoconf/Makefile
+++ b/build/autoconf/Makefile
@@ -5,32 +5,20 @@ default: all
 	install install-bin install-doc install-abs \
 	tests
 
+TESTDIR=../../tests
+SOURCEDIR=../../src/
 
-TESTDIR=../tests
+HELPERSOURCES=$(SOURCEDIR)z_zexy.c $(SOURCEDIR)zexy.c $(SOURCEDIR)winNT_portio.c
 
-HELPERSOURCES=z_zexy.c zexy.c winNT_portio.c
-
-OBJECTSOURCES=$(sort $(filter-out $(HELPERSOURCES), $(filter %.c, $(wildcard *.c))))
+OBJECTSOURCES=$(sort $(filter-out $(HELPERSOURCES), $(filter %.c, $(wildcard $(SOURCEDIR)*.c))))
 
 SOURCES=$(OBJECTSOURCES) $(HELPERSOURCES)
 
-zexyconf.h: zexyconf.h.in configure
-	./configure $(CONFIGUREFLAGS)
-
-configure: configure.ac aclocal.m4
-	autoconf
 
-aclocal.m4: acinclude.m4
-	aclocal
+VPATH = $(SOURCEDIR)
 
 -include $(SOURCES:.c=.d)
 
-Make.config: Make.config.in configure
-	./configure $(CONFIGUREFLAGS)
-
-z_zexy.c z_zexy.h:
-	./makesource.sh
-
 -include Make.config
 
 ##  2nd only generate depend-files when we have Make.config included
@@ -65,7 +53,7 @@ $(OBJECTS): %.$(EXT) : %.o
 	$(STRIP) $(STRIPFLAGS) $@
 
 $(LIBNAME): $(TARGETS) z_zexy.c z_zexy.h
-	$(LD) $(LFLAGS) -o $@.$(EXT) *.o $(LIBS)
+	$(LD) $(LFLAGS) -o $@.$(EXT) $(SOURCEDIR)*.o $(LIBS)
 	$(STRIP) $(STRIPFLAGS) $@.$(EXT)
 
 $(TARGETS): %.o : %.c
diff --git a/build/autoconf/configure.ac b/build/autoconf/configure.ac
index 371fcc2..0eb5307 100644
--- a/build/autoconf/configure.ac
+++ b/build/autoconf/configure.ac
@@ -423,5 +423,5 @@ AC_CHECK_HEADERS(m_pd.h, ,
         "--includedir=</path/to/pd/src/>"]))
 
 LFLAGS=${LDFLAGS}
-AC_OUTPUT(../../src/Make.config)
+AC_OUTPUT(Make.config)
 
-- 
cgit v1.2.1