Fix autoconf/automake stuff for embedded libs

* Made it so configure script actually rebuilds Makefile for libresample
* Reverted autogen.sh change (see below)

In a chroot, for debian, for autoconf1.8, there MUST be a space between '-I' and
the path.  Other versions, it is the opposite, I think that is why we keep
flipping this change on and off.

CR: infamouspat

diff --git a/autogen.sh b/autogen.sh
index 4e05f65..a9d064e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="stepmania"
 
 AUTOHEADER=autoheader
-ACLOCAL_OPTIONS="-Iautoconf/m4/"
+ACLOCAL_OPTIONS="-I autoconf/m4/"
 AUTOMAKE_OPTIONS=-a
 
 AUTOCONF=autoconf

diff --git a/configure.ac b/configure.ac
index 64a2d37..b985c90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -275,4 +275,8 @@ AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes" )
 
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(src/Makefile)
+
+# TODO: clean this up - kinda hacky...
+cd src/libresample && ./configure && cd ../..
+
 AC_OUTPUT

diff --git a/src/libresample/Makefile b/src/libresample/Makefile
deleted file mode 100755 (executable)
index 45f4d62..0000000
--- a/src/libresample/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Run configure to generate Makefile from Makefile.in on
-# any system supported by GNU autoconf.  For all other
-# systems, use this file as a template to create a
-# working Makefile.
-
-CC = gcc
-CFLAGS = -g -O2 -Wall
-
-LIBS =  -lm
-
-AR = /usr/bin/ar
-RANLIB = ranlib
-srcdir=.
-
-OBJS = \
-       src/resample.c.o \
-       src/resamplesubs.c.o \
-       src/filterkit.c.o
-
-TARGETS = libresample.a tests/testresample tests/resample-sndfile tests/compareresample
-DIRS=tests
-
-all: $(TARGETS)
-
-libresample.a: $(OBJS) Makefile
-       $(AR) ruv libresample.a $(OBJS)
-       ranlib libresample.a
-
-tests/testresample: libresample.a $(srcdir)/tests/testresample.c $(DIRS)
-       $(CC) -o tests/testresample \
-               $(CFLAGS) $(srcdir)/tests/testresample.c \
-               libresample.a $(LIBS)
-
-tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
-       $(CC) -o tests/compareresample \
-               $(CFLAGS) $(srcdir)/tests/compareresample.c \
-               libresample.a -lsamplerate $(LIBS)
-
-tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c $(DIRS)
-       $(CC) -o tests/resample-sndfile \
-               $(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
-               libresample.a -lsndfile $(LIBS)
-
-$(DIRS):
-       mkdir $(DIRS)
-
-clean:
-       rm -f $(TARGETS) $(OBJS)
-
-dist: clean
-       rm -f Makefile
-       rm -f config.status config.cache config.log src/config.h
-       rm -f *~ src/*~ tests/*~ include/*~
-
-$(OBJS): %.c.o: $(srcdir)/%.c Makefile $(srcdir)/include/libresample.h \
-       $(srcdir)/src/resample_defs.h $(srcdir)/src/filterkit.h $(srcdir)/src/config.h
-       $(CC) -c $(CFLAGS) $< -o $@