[PD-cvs] externals/iem/amixer Make.config.in, NONE, 1.1 Make.version, NONE, 1.1 Makefile, NONE, 1.1 amixer.c, 1.1, 1.2 configure.ac, 1.1, 1.2 Makefile.in, 1.1, NONE

[IOhannes m zmölnig]

Update of /cvsroot/pure-data/externals/iem/amixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22492

Modified Files:
	amixer.c configure.ac 
Added Files:
	Make.config.in Make.version Makefile 
Removed Files:
	Makefile.in 
Log Message:
updated a bit...


--- Makefile.in DELETED ---

--- NEW FILE: Makefile ---
default: all

include Make.version

Make.config: Make.config.in configure
	./configure

include Make.config

.SUFFIXES: .$(EXT)

SOURCES=$(sort $(filter %.c, $(wildcard *.c)))
TARGETS = $(SOURCES:.c=.o)


all: $(LIBNAME)

clean:
	-rm -f *.o *.d

binclean:
	-rm -f *.$(EXT)

distclean: clean binclean
	-rm -f *~ _* config.*
	-rm -rf autom4te.cache

install: install-bin install-doc

install-bin:
	-install -d $(INSTALL_BIN)
	-install -m 644 $(LIBNAME).$(EXT) $(INSTALL_BIN)

install-doc:
	-install -d $(INSTALL_DOC)
	-install -m 644 ../doc/*.pd $(INSTALL_DOC)

dist: distclean
	(cd ..;tar czvf $(TARNAME) $(LIBNAME))

distbin: distclean all clean
	(cd ..; tar cvzf $(BINTARNAME) $(LIBNAME))

everything: clean all install distclean


$(LIBNAME): $(TARGETS)
	$(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
	$(STRIP) $(LIBNAME).$(EXT)


## dependencies: as proposed by the GNU-make documentation
## see http://www.gnu.org/software/make/manual/html_node/make_47.html#SEC51
-include $(SOURCES:.c=.d)
%.d: %.c
	@set -e; rm -f $@; \
	 $(CC) $(MAKEDEP_FLAGS) $(CFLAGS) $< > $@.$$$$; \
	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
	 rm -f $@.$$$$

configure: configure.ac
	autoconf

Index: amixer.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/amixer/amixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** amixer.c	3 Nov 2005 11:42:02 -0000	1.1
--- amixer.c	3 Nov 2005 11:55:04 -0000	1.2
***************
*** 663,672 ****
  }
  
- 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)
  {
--- 663,666 ----
***************
*** 734,739 ****
    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);
--- 728,731 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/amixer/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.ac	3 Nov 2005 11:42:02 -0000	1.1
--- configure.ac	3 Nov 2005 11:55:04 -0000	1.2
***************
*** 2,6 ****
  AC_INIT(amixer.c)
  
- VERSION=0.0.1
  LIBNAME=amixer
  
--- 2,5 ----
***************
*** 18,22 ****
  AC_SUBST(PDLIBDIR)
  AC_SUBST(INCLUDES)
- AC_SUBST(VERSION)
  AC_SUBST(LIBNAME)
  
--- 17,20 ----
***************
*** 220,224 ****
  fi
  
! AC_OUTPUT(Makefile)
  
  rm -f conftest.*
--- 218,222 ----
  fi
  
! AC_OUTPUT(Make.config)
  
  rm -f conftest.*

--- NEW FILE: Make.version ---
LIBNAME = amixer
VERSION = 0.0.1

--- NEW FILE: Make.config.in ---
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@