[Demudi-commits] r314 - in brutefir/trunk: . debian/patches

[Free Ekanayaka]

Author: free-guest
Date: 2004-12-10 02:24:55 -0700 (Fri, 10 Dec 2004)
New Revision: 314

Added:
   brutefir/trunk/debian/patches/00list
   brutefir/trunk/debian/patches/10_Makefile.dpatch
Removed:
   brutefir/trunk/.#Makefile.1.2
Log:
Added missing files

Deleted: brutefir/trunk/.#Makefile.1.2
===================================================================
--- brutefir/trunk/.#Makefile.1.2	2004-12-10 09:17:44 UTC (rev 313)
+++ brutefir/trunk/.#Makefile.1.2	2004-12-10 09:24:55 UTC (rev 314)
@@ -1,137 +0,0 @@
-###################################
-# Where to install
-INSTALL_PREFIX	= $(DESTDIR)/usr
-
-###################################
-# Where to find libraries, and their header files.
-LIBPATHS	= -L/usr/lib
-INCLUDE		= -I/usr/include
-
-###################################
-# FFTW3 libraries for single and double precision
-FFTW_LIB	= -lfftw3 -lfftw3f
-
-###################################
-# Binaries
-FLEX	= flex
-LD	= ld
-CC	= gcc
-AS	= as
-
-
-###################################
-# Flags
-CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
--Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wnested-externs
-CC_FLAGS	= $(DEFINE) -O2
-CC_FPIC		= -fPIC
-LD_SHARED	= -shared
-
-###################################
-# Objects and libs for targets
-BRUTEFIR_LIBS	= $(FFTW_LIB) -lm -ldl
-BRUTEFIR_OBJS	= brutefir.o fftw_convolver.o bfconf.o bfrun.o merge.o \
-emalloc.o shmalloc.o dai.o bfconf_lexical.o inout.o dither.o delay.o 
-BRUTEFIR_IA32_OBJS = convolver_sse2.o convolver_sse.o \
-convolver_3dnow.o convolver_x87.o
-
-BFIO_FILE_OBJS	= bfio_file.o
-
-BFIO_ALSA_LIBS	= -lasound
-BFIO_ALSA_OBJS	= bfio_alsa.o emalloc.o inout.o
-
-BFIO_JACK_LIBS	= -ljack
-BFIO_JACK_OBJS	= bfio_jack.o emalloc.o inout.o
-
-BFLOGIC_CLI_OBJS = bflogic_cli.o inout.o
-BFLOGIC_EQ_OBJS	= bflogic_eq.o emalloc.o shmalloc.o
-
-BIN_TARGETS	= brutefir
-LIB_TARGETS	= cli.bflogic eq.bflogic file.bfio
-
-###################################
-# System-specific settings
-
-UNAME	= $(shell uname)
-#
-# Specific SUN Solaris settings. We assume Sparc-V8+ here
-#
-ifeq ($(UNAME),SunOS)
-CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
--Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
--Wnested-externs
-CC_FLAGS	+= -Wa,-xarch=v8plus
-BRUTEFIR_LIBS	+= -lrt
-endif
-
-#
-# Specific FreeBSD settings. We assume i386 here
-#
-ifeq ($(UNAME),FreeBSD)
-BRUTEFIR_OBJS += $(BRUTEFIR_IA32_OBJS)
-endif
-
-#
-# Specific Linux settings. We assume i386 and ALSA here
-#
-ifeq ($(UNAME),Linux)
-BRUTEFIR_OBJS += $(BRUTEFIR_IA32_OBJS)
-LIB_TARGETS	+= alsa.bfio
-LIB_TARGETS	+= jack.bfio
-endif
-
-TARGETS		= $(BIN_TARGETS) $(LIB_TARGETS)
-
-###################################
-# Targets
-
-all: $(TARGETS)
-
-%.chkr.o: %.chkr.c
-	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-
-%.o: %.s
-	$(AS) -o $@			$<
-
-%.o: %.c
-	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-
-# special rule to avoid to get warnings from code generated by flex
-bfconf_lexical.o: bfconf_lexical.c
-	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-
-%.c: %.lex
-	$(FLEX) -o$@ $<
-
-brutefir: $(BRUTEFIR_OBJS)
-	$(CC) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-
-alsa.bfio: CC_FLAGS += $(CC_FPIC)
-alsa.bfio: $(BFIO_ALSA_OBJS)
-	$(LD) $(LD_SHARED) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS)
-
-jack.bfio: CC_FLAGS += $(CC_FPIC)
-jack.bfio: $(BFIO_JACK_OBJS)
-	$(LD) $(LD_SHARED) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS)
-
-file.bfio: CC_FLAGS += $(CC_FPIC)
-file.bfio: $(BFIO_FILE_OBJS)
-	$(LD) $(LD_SHARED) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS)
-
-cli.bflogic: CC_FLAGS += $(CC_FPIC)
-cli.bflogic: $(BFLOGIC_CLI_OBJS)
-	$(LD) $(LD_SHARED) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS)
-
-eq.bflogic: CC_FLAGS += $(CC_FPIC)
-eq.bflogic: $(BFLOGIC_EQ_OBJS)
-	$(LD) $(LD_SHARED) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS)
-
-install: $(BIN_TARGETS) $(LIB_TARGETS)
-	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
-	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
-
-clean:
-	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
-$(BFLOGIC_CLI_OBJS) $(BFLOGIC_EQ_OBJS) $(BFIO_ALSA_OBJS) $(BFIO_JACK_OBJS)     \
-$(TARGETS)

Added: brutefir/trunk/debian/patches/00list
===================================================================
--- brutefir/trunk/debian/patches/00list	2004-12-10 09:17:44 UTC (rev 313)
+++ brutefir/trunk/debian/patches/00list	2004-12-10 09:24:55 UTC (rev 314)
@@ -0,0 +1 @@
+10_Makefile

Added: brutefir/trunk/debian/patches/10_Makefile.dpatch
===================================================================
--- brutefir/trunk/debian/patches/10_Makefile.dpatch	2004-12-10 09:17:44 UTC (rev 313)
+++ brutefir/trunk/debian/patches/10_Makefile.dpatch	2004-12-10 09:24:55 UTC (rev 314)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_Makefile.dpatch by Free Ekanayaka <free@agnula.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad brutefir-1.0/Makefile /tmp/dpep.OXeq7C/brutefir-1.0/Makefile
+--- brutefir-1.0/Makefile	2004-04-21 21:49:00.000000000 +0200
++++ /tmp/dpep.OXeq7C/brutefir-1.0/Makefile	2004-12-10 09:14:19.000000000 +0100
+@@ -1,11 +1,11 @@
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++INSTALL_PREFIX	= $(DESTDIR)/usr
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
++LIBPATHS	= -L/usr/lib
++INCLUDE		= -I/usr/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include


Property changes on: brutefir/trunk/debian/patches/10_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *