diff options
-rw-r--r-- | Make.config.in | 31 | ||||
-rw-r--r-- | Make.version | 2 | ||||
-rw-r--r-- | Makefile (renamed from Makefile.in) | 32 | ||||
-rw-r--r-- | amixer.c | 8 | ||||
-rw-r--r-- | configure.ac | 4 |
5 files changed, 39 insertions, 38 deletions
diff --git a/Make.config.in b/Make.config.in new file mode 100644 index 0000000..d3ac25f --- /dev/null +++ b/Make.config.in @@ -0,0 +1,31 @@ +LIBNAME ?= @LIBNAME@ +VERSION ?= @VERSION@ + +PREFIX =@prefix@@PDLIBDIR@ + +INSTALL_BIN=$(PREFIX)/extra +INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME) + +EXT = @EXT@ +VERSION ?= @VERSION@ +DEFS = @DFLAGS@ -DACONNECT_VERSION=\"$(VERSION)\" +IFLAGS = -I. @INCLUDES@ $(INCLUDES) + +CC = @CC@ +LD = @LD@ +STRIP = @STRIP@ @STRIPFLAGS@ + +AFLAGS = +LFLAGS = @LFLAGS@ +WFLAGS = + +MAKEDEP_FLAGS = @MAKEDEP_FLAGS@ + +TARNAME = $(LIBNAME)-$(VERSION).tgz +BINTARNAME = $(LIBNAME)-$(VERSION)-bin.tgz + + +CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@ + +LIBS = @LIBS@ + diff --git a/Make.version b/Make.version new file mode 100644 index 0000000..4fe8ee2 --- /dev/null +++ b/Make.version @@ -0,0 +1,2 @@ +LIBNAME = amixer +VERSION = 0.0.1 @@ -1,33 +1,14 @@ -LIBNAME =@LIBNAME@ +default: all -PREFIX =@prefix@@PDLIBDIR@ +include Make.version -INSTALL_BIN=$(PREFIX)/extra -INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME) - -EXT = @EXT@ -DEFS = @DFLAGS@ -DACONNECT_VERSION=\"@VERSION@\" -IFLAGS = -I. @INCLUDES@ $(INCLUDES) - -CC = @CC@ -LD = @LD@ -STRIP = @STRIP@ @STRIPFLAGS@ - -AFLAGS = -LFLAGS = @LFLAGS@ -WFLAGS = - -MAKEDEP_FLAGS = @MAKEDEP_FLAGS@ +Make.config: Make.config.in configure + ./configure -TARNAME = $(LIBNAME)-@VERSION@.tgz -BINTARNAME = $(LIBNAME)-@VERSION@-bin.tgz +include Make.config .SUFFIXES: .$(EXT) -CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@ - -LIBS = @LIBS@ - SOURCES=$(sort $(filter %.c, $(wildcard *.c))) TARGETS = $(SOURCES:.c=.o) @@ -79,6 +60,3 @@ $(LIBNAME): $(TARGETS) configure: configure.ac autoconf - -Makefile: Makefile.in configure - ./configure @@ -662,12 +662,6 @@ static void amixer_cset(t_amixer *x, t_symbol *s, int argc, t_atom *argv) amixer_control(x, argc, argv, 0); } -static void amixer_sget(t_amixer *x, t_symbol *s, int argc, t_atom *argv) -{ -} -static void amixer_sset(t_amixer *x, t_symbol *s, int argc, t_atom *argv) -{ -} static void amixer_card(t_amixer *x, t_symbol *s, int argc, t_atom *argv) { if(1==argc){ @@ -733,8 +727,6 @@ void amixer_setup(void) class_addmethod(amixer_class, (t_method)amixer_cset,gensym("set"), A_GIMME, 0); class_addmethod(amixer_class, (t_method)amixer_cget,gensym("cget"), A_GIMME, 0); class_addmethod(amixer_class, (t_method)amixer_cset,gensym("cset"), A_GIMME, 0); - class_addmethod(amixer_class, (t_method)amixer_sget,gensym("sget"), A_GIMME, 0); - class_addmethod(amixer_class, (t_method)amixer_sset,gensym("sset"), A_GIMME, 0); // class_addmethod(amixer_class, (t_method)amixer_listdevices,gensym(""), A_DEFSYM, 0); class_addbang(amixer_class, (t_method)amixer_bang); diff --git a/configure.ac b/configure.ac index b36f568..2f45e52 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(amixer.c) -VERSION=0.0.1 LIBNAME=amixer dnl Checks for programs. @@ -17,7 +16,6 @@ AC_SUBST(STRIPFLAGS) AC_SUBST(REFERENCEPATH) AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) -AC_SUBST(VERSION) AC_SUBST(LIBNAME) @@ -219,6 +217,6 @@ else echo " no" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Make.config) rm -f conftest.* |