From d2fc02f39f3c56dbb4c9c40944c54cff3f497e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 8 Jul 2005 11:37:04 +0000 Subject: hopefully this is the last checkin regarding the ACONNECT_VERSION svn path=/trunk/externals/iem/aconnect/; revision=3307 --- Makefile | 6 +++--- Makefile.in | 6 +++--- configure | 6 ++---- configure.ac | 4 +--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 239e3c9..6587828 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ INSTALL_BIN=$(PREFIX)/extra INSTALL_DOC=$(PREFIX)/extra/help-$(LIBNAME) EXT = pd_linux -DEFS = -DACONNECT_VERSION=\"0.2\" -DHAVE_ALSA +DEFS = -DHAVE_ALSA -DACONNECT_VERSION=\"0.2\" IFLAGS = -I. $(INCLUDES) CC = gcc @@ -19,8 +19,8 @@ WFLAGS = MAKEDEP_FLAGS = -MM -TARNAME = $(LIBNAME).tgz -BINTARNAME = $(LIBNAME)-bin.tgz +TARNAME = $(LIBNAME)-0.2.tgz +BINTARNAME = $(LIBNAME)-0.2-bin.tgz .SUFFIXES: .$(EXT) diff --git a/Makefile.in b/Makefile.in index 1e36344..73f5608 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ INSTALL_BIN=$(PREFIX)/extra INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME) EXT = @EXT@ -DEFS = @DFLAGS@ +DEFS = @DFLAGS@ -DACONNECT_VERSION=\"@VERSION@\" IFLAGS = -I. @INCLUDES@ $(INCLUDES) CC = @CC@ @@ -19,8 +19,8 @@ WFLAGS = MAKEDEP_FLAGS = @MAKEDEP_FLAGS@ -TARNAME = $(LIBNAME).tgz -BINTARNAME = $(LIBNAME)-bin.tgz +TARNAME = $(LIBNAME)-@VERSION@.tgz +BINTARNAME = $(LIBNAME)-@VERSION@-bin.tgz .SUFFIXES: .$(EXT) diff --git a/configure b/configure index fe1a4ee..8fc55ec 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT STK DFLAGS LFLAGS EXT LD STRIP STRIPFLAGS REFERENCEPATH PDLIBDIR INCLUDES SOURCES CPP EGREP MAKEDEP_FLAGS ac_ct_LD ac_ct_STRIP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT STK DFLAGS LFLAGS EXT LD STRIP STRIPFLAGS REFERENCEPATH PDLIBDIR INCLUDES VERSION CPP EGREP MAKEDEP_FLAGS ac_ct_LD ac_ct_STRIP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2533,8 +2533,6 @@ if test "x$ac_cv_lib_asound_snd_seq_close" = "xyes"; then DFLAGS="-DHAVE_ALSA ${DFLAGS}" fi -DFLAGS="-DACONNECT_VERSION=\\\"${VERSION}\\\" ${DFLAGS}" - if test "x$includedir" != "x"; then for id in $includedir do @@ -4810,7 +4808,7 @@ s,@STRIPFLAGS@,$STRIPFLAGS,;t t s,@REFERENCEPATH@,$REFERENCEPATH,;t t s,@PDLIBDIR@,$PDLIBDIR,;t t s,@INCLUDES@,$INCLUDES,;t t -s,@SOURCES@,$SOURCES,;t t +s,@VERSION@,$VERSION,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@MAKEDEP_FLAGS@,$MAKEDEP_FLAGS,;t t diff --git a/configure.ac b/configure.ac index 03ff035..7ce5e20 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_SUBST(STRIPFLAGS) AC_SUBST(REFERENCEPATH) AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) -AC_SUBST(SOURCES) +AC_SUBST(VERSION) AC_ARG_WITH(pdversion, [ --with-pdversion= enforce a certain pd-version (e.g. 0.37)]) @@ -41,8 +41,6 @@ if test "x$ac_cv_lib_asound_snd_seq_close" = "xyes"; then DFLAGS="-DHAVE_ALSA ${DFLAGS}" fi -DFLAGS="-DACONNECT_VERSION=\\\"${VERSION}\\\" ${DFLAGS}" - if test "x$includedir" != "x"; then for id in $includedir do -- cgit v1.2.1