diff options
| author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2010-11-12 10:13:42 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2010-11-12 10:13:42 +0000 |
| commit | e239ad2c63b29814e57ab2375a4cc25803add404 (patch) | |
| tree | c54afea90e590475476efbdd3afeaa50636f6a68 | |
| parent | ae49ad28864d766209b15111a31bd4ee60893957 (diff) | |
getting rid of olde tests; cleaned up code
svn path=/trunk/externals/iem/syslog/; revision=14432
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | configure.ac | 50 |
2 files changed, 5 insertions, 55 deletions
diff --git a/Makefile.in b/Makefile.in index 55de641..42fadf2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ VERSION =0.1 PREFIX =@prefix@@PDLIBDIR@ -INSTALL_BIN=$(PREFIX)/extra +INSTALL_BIN=$(PREFIX)/extra/$(LIBNAME) EXT = @EXT@ DEFS = @DFLAGS@ -DVERSION=\"$(VERSION)\" @@ -32,7 +32,7 @@ SOURCES=$(sort $(filter %.c, $(wildcard *.c))) TARGETS = $(SOURCES:.c=.o) -all: $(LIBNAME) +all: $(LIBNAME).$(EXT) clean: -rm -f *.o *.d @@ -63,9 +63,9 @@ distbin: distclean all clean everything: clean all install distclean -$(LIBNAME): $(TARGETS) - $(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS) - $(STRIP) $(LIBNAME).$(EXT) +$(LIBNAME).$(EXT): $(TARGETS) + $(LD) $(LFLAGS) -o $@ $< $(LIBS) + $(STRIP) $@ ## dependencies: as proposed by the GNU-make documentation diff --git a/configure.ac b/configure.ac index 04f7bee..37fdc83 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,6 @@ AC_SUBST(INCLUDES) AC_SUBST(VERSION) -AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)]) AC_ARG_WITH(extension, [ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)]) @@ -166,55 +165,6 @@ then EXT=$with_extension fi - -dnl Checks for pd-version, to set the correct help-path -AC_MSG_CHECKING("pd\>=0.37") - -if test "$with_pdversion" != "" -then -echo -n "($with_pdversion)... " - PD_VERSION="$with_pdversion" -else -if test "x$cross_compiling" = "xno" -then - -cat > conftest.c << EOF -#include <stdio.h> -#include "m_pd.h" -int main(){ - printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); - return 0; -} -EOF - - if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 - then - PD_VERSION=`./conftest.o` - else - PD_VERSION="" - fi - echo -n $PD_VERSION -else -dnl we are cross-compiling... - echo -n "(X)..." - PD_VERSION="0.38" -fi -fi - -let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 -let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 - - - -if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 -then - REFERENCEPATH=extra/help- - echo " yes" -else - REFERENCEPATH=doc/5.reference/ - echo " no" -fi - AC_OUTPUT(Makefile) rm -f conftest.* |