Files
filtlan/filtlan-1.0a-shared.patch
2013-01-20 19:57:38 +00:00

243 lines
10 KiB
Diff

diff -aruN FILTLAN.orig/DRIVERS/DOUBLE/Makefile FILTLAN/DRIVERS/DOUBLE/Makefile
--- FILTLAN.orig/DRIVERS/DOUBLE/Makefile 2011-08-17 03:52:43.000000000 +0200
+++ FILTLAN/DRIVERS/DOUBLE/Makefile 2012-12-09 22:13:33.894485847 +0100
@@ -6,12 +6,12 @@
MATKIT_DIR = $(ROOT_DIR)/MATKIT
MATKIT_INC = $(MATKIT_DIR)/INCLUDE
MATKIT_HEADS = $(MATKIT_INC)/matkitdef.h $(MATKIT_INC)/matkitfunc.h $(MATKIT_INC)/basics.h $(MATKIT_INC)/vector.h $(MATKIT_INC)/matrix.h $(MATKIT_INC)/symmatrix.h $(MATKIT_INC)/spmatrix.h
-MATKIT_LIB = $(LIB_DIR)/libdmatkit.a
+MATKIT_LIB = $(LIB_DIR)/libdmatkit.so
FILTLAN_DIR = $(ROOT_DIR)
FILTLAN_INC = $(FILTLAN_DIR)/INCLUDE
FILTLAN_HEADS = $(FILTLAN_INC)/filtlan.h $(FILTLAN_INC)/polyfilt.h $(FILTLAN_INC)/laneig.h $(FILTLAN_INC)/symtrieig.h
-FILTLAN_LIB = $(LIB_DIR)/libdfiltlan.a
+FILTLAN_LIB = $(LIB_DIR)/libdfiltlan.so
DRIVERS_SRC = $(FILTLAN_DIR)/DRIVERS
@@ -26,28 +26,28 @@
XFLAGS =
laneig_driver: laneig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o laneig_driver laneig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o laneig_driver laneig_driver.o -L$(LIB_DIR) -ldfiltlan -ldmatkit $(LOADFLAGS)
laneig_driver.o: $(DRIVERS_SRC)/laneig_driver.cpp $(MATKIT_HEADS) $(FILTLAN_INC)/laneig.h $(FILTLAN_INC)/symtrieig.h
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/laneig_driver.cpp
polyfilt_driver: polyfilt_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o polyfilt_driver polyfilt_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o polyfilt_driver polyfilt_driver.o -L$(LIB_DIR) -ldfiltlan -ldmatkit $(LOADFLAGS)
polyfilt_driver.o: $(DRIVERS_SRC)/polyfilt_driver.cpp $(MATKIT_HEADS) $(FILTLAN_INC)/polyfilt.h
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/polyfilt_driver.cpp
filtlan_driver: filtlan_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o filtlan_driver filtlan_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o filtlan_driver filtlan_driver.o -L$(LIB_DIR) -ldfiltlan -ldmatkit $(LOADFLAGS)
filtlan_driver.o: $(DRIVERS_SRC)/filtlan_driver.cpp $(MATKIT_HEADS) $(FILTLAN_HEADS)
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/filtlan_driver.cpp
numeig_driver: numeig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o numeig_driver numeig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o numeig_driver numeig_driver.o -L$(LIB_DIR) -ldfiltlan -ldmatkit $(LOADFLAGS)
numeig_driver.o: $(DRIVERS_SRC)/numeig_driver.cpp $(MATKIT_HEADS) $(FILTLAN_HEADS)
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/numeig_driver.cpp
diff -aruN FILTLAN.orig/DRIVERS/SINGLE/Makefile FILTLAN/DRIVERS/SINGLE/Makefile
--- FILTLAN.orig/DRIVERS/SINGLE/Makefile 2011-08-17 03:54:01.000000000 +0200
+++ FILTLAN/DRIVERS/SINGLE/Makefile 2012-12-09 22:15:18.270488323 +0100
@@ -6,13 +6,13 @@
MATKIT_DIR = $(ROOT_DIR)/MATKIT
MATKIT_INC = $(MATKIT_DIR)/INCLUDE
MATKIT_HEADS = $(MATKIT_INC)/matkitdef.h $(MATKIT_INC)/matkitfunc.h $(MATKIT_INC)/basics.h $(MATKIT_INC)/vector.h $(MATKIT_INC)/matrix.h $(MATKIT_INC)/symmatrix.h $(MATKIT_INC)/spmatrix.h
-MATKIT_LIB = $(LIB_DIR)/libsmatkit.a
+MATKIT_LIB = $(LIB_DIR)/libsmatkit.so
FILTLAN_DIR = $(ROOT_DIR)
FILTLAN_INC = $(FILTLAN_DIR)/INCLUDE
LANCZOS_HEADS = $(FILTLAN_INC)/laneig.h $(FILTLAN_INC)/symtrieig.h
FILTLAN_HEADS = $(FILTLAN_INC)/filtlan.h $(FILTLAN_INC)/polyfilt.h $(FILTLAN_INC)/laneig.h $(FILTLAN_INC)/symtrieig.h
-FILTLAN_LIB = $(LIB_DIR)/libsfiltlan.a
+FILTLAN_LIB = $(LIB_DIR)/libsfiltlan.so
DRIVERS_SRC = $(FILTLAN_DIR)/DRIVERS
@@ -25,28 +25,28 @@
XFLAGS = -DUSE_SINGLE
laneig_driver: laneig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o laneig_driver laneig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o laneig_driver laneig_driver.o -L$(LIB_DIR) -lsmatkit -lsfiltlan $(LOADFLAGS)
laneig_driver.o: $(DRIVERS_SRC)/laneig_driver.cpp $(MATKIT_HEADS) $(FILTLAN_INC)/laneig.h $(FILTLAN_INC)/symtrieig.h
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/laneig_driver.cpp
polyfilt_driver: polyfilt_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o polyfilt_driver polyfilt_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o polyfilt_driver polyfilt_driver.o -L$(LIB_DIR) -lsmatkit -lsfiltlan $(LOADFLAGS)
polyfilt_driver.o: $(DRIVERS_SRC)/polyfilt_driver.cpp $(MATKIT_HEADS) $(FILTLAN_INC)/polyfilt.h
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/polyfilt_driver.cpp
filtlan_driver: filtlan_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o filtlan_driver filtlan_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o filtlan_driver filtlan_driver.o -L$(LIB_DIR) -lsmatkit -lsfiltlan $(LOADFLAGS)
filtlan_driver.o: $(DRIVERS_SRC)/filtlan_driver.cpp $(MATKIT_HEADS) $(FILTLAN_HEADS)
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/filtlan_driver.cpp
numeig_driver: numeig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB)
- $(CPP) -o numeig_driver numeig_driver.o $(FILTLAN_LIB) $(MATKIT_LIB) $(LOADFLAGS)
+ $(CPP) -o numeig_driver numeig_driver.o -L$(LIB_DIR) -lsmatkit -lsfiltlan $(LOADFLAGS)
numeig_driver.o: $(DRIVERS_SRC)/numeig_driver.cpp $(MATKIT_HEADS) $(FILTLAN_HEADS)
$(CPP) $(CFLAGS) $(XFLAGS) -I$(MATKIT_INC) -I$(FILTLAN_INC) -c $(DRIVERS_SRC)/numeig_driver.cpp
diff -aruN FILTLAN.orig/MATKIT/OBJ/DOUBLE/Makefile FILTLAN/MATKIT/OBJ/DOUBLE/Makefile
--- FILTLAN.orig/MATKIT/OBJ/DOUBLE/Makefile 2011-08-18 14:10:36.000000000 +0200
+++ FILTLAN/MATKIT/OBJ/DOUBLE/Makefile 2012-12-09 22:21:46.938497542 +0100
@@ -8,7 +8,7 @@
LIB_DIR = $(ROOT_DIR)/LIB
-all: $(LIB_DIR)/libdmatkit.a
+all: $(LIB_DIR)/libdmatkit.so
# by default, we use double precision (not single precision) floating point numbers
@@ -47,6 +47,11 @@
fi
$(AR) $(ARFLAGS) $(LIB_DIR)/libdmatkit.a $(OBJS)
+$(LIB_DIR)/libdmatkit.so: $(OBJS)
+ if [ ! -d $(LIB_DIR) ]; then \
+ mkdir $(LIB_DIR); \
+fi
+ $(CPP) -shared -Wl,-soname=libdmatkit.so.0 -o $(LIB_DIR)/libdmatkit.so $(OBJS)
clean:
rm -f *.o $(LIB_DIR)/libdmatkit.a
diff -aruN FILTLAN.orig/MATKIT/OBJ/SINGLE/Makefile FILTLAN/MATKIT/OBJ/SINGLE/Makefile
--- FILTLAN.orig/MATKIT/OBJ/SINGLE/Makefile 2011-08-18 14:10:45.000000000 +0200
+++ FILTLAN/MATKIT/OBJ/SINGLE/Makefile 2012-12-09 21:58:08.346463884 +0100
@@ -8,7 +8,7 @@
LIB_DIR = $(ROOT_DIR)/LIB
-all: $(LIB_DIR)/libsmatkit.a
+all: $(LIB_DIR)/libsmatkit.so
XFLAGS = -DUSE_SINGLE
@@ -45,6 +45,12 @@
fi
$(AR) $(ARFLAGS) $(LIB_DIR)/libsmatkit.a $(OBJS)
+$(LIB_DIR)/libsmatkit.so: $(OBJS)
+ if [ ! -d $(LIB_DIR) ]; then \
+ mkdir $(LIB_DIR); \
+fi
+ $(CPP) -shared -Wl,-soname=libsmatkit.so.0 -o $(LIB_DIR)/libsmatkit.so $(OBJS)
+
clean:
rm -f *.o $(LIB_DIR)/libsmatkit.a
diff -aruN FILTLAN.orig/MATKIT/TESTS/Makefile FILTLAN/MATKIT/TESTS/Makefile
--- FILTLAN.orig/MATKIT/TESTS/Makefile 2011-08-21 15:41:03.000000000 +0200
+++ FILTLAN/MATKIT/TESTS/Makefile 2012-12-09 22:00:10.194466775 +0100
@@ -14,28 +14,28 @@
# double precision test drivers
-test_matkit: test_matkit.o $(LIB_DIR)/libdmatkit.a
- $(CPP) -o test_matkit test_matkit.o $(LIB_DIR)/libdmatkit.a $(LOADFLAGS)
+test_matkit: test_matkit.o $(LIB_DIR)/libdmatkit.so
+ $(CPP) -o test_matkit test_matkit.o $(LIB_DIR)/libdmatkit.so $(LOADFLAGS)
test_matkit.o: test_matkit.cpp $(HEADERS)
$(CPP) $(CFLAGS) $(DFLAGS) -I$(INC_DIR) -c -o test_matkit.o test_matkit.cpp
-test_matkit_efficiency: test_matkit_efficiency.o $(LIB_DIR)/libdmatkit.a
- $(CPP) -o test_matkit_efficiency test_matkit_efficiency.o $(LIB_DIR)/libdmatkit.a $(LOADFLAGS)
+test_matkit_efficiency: test_matkit_efficiency.o $(LIB_DIR)/libdmatkit.so
+ $(CPP) -o test_matkit_efficiency test_matkit_efficiency.o $(LIB_DIR)/libdmatkit.so $(LOADFLAGS)
test_matkit_efficiency.o: test_matkit_efficiency.cpp $(HEADERS)
$(CPP) $(CFLAGS) $(DFLAGS) -I$(INC_DIR) -c -o test_matkit_efficiency.o test_matkit_efficiency.cpp
# single precision test drivers
-test_matkit_single: test_matkit_single.o $(LIB_DIR)/libsmatkit.a
- $(CPP) -o test_matkit_single test_matkit_single.o $(LIB_DIR)/libsmatkit.a $(LOADFLAGS)
+test_matkit_single: test_matkit_single.o $(LIB_DIR)/libsmatkit.so
+ $(CPP) -o test_matkit_single test_matkit_single.o $(LIB_DIR)/libsmatkit.so $(LOADFLAGS)
test_matkit_single.o: test_matkit.cpp $(HEADERS)
$(CPP) $(CFLAGS) $(SFLAGS) -I$(INC_DIR) -c -o test_matkit_single.o test_matkit.cpp
-test_matkit_efficiency_single: test_matkit_efficiency_single.o $(LIB_DIR)/libsmatkit.a
- $(CPP) -o test_matkit_efficiency_single test_matkit_efficiency_single.o $(LIB_DIR)/libsmatkit.a $(LOADFLAGS)
+test_matkit_efficiency_single: test_matkit_efficiency_single.o $(LIB_DIR)/libsmatkit.so
+ $(CPP) -o test_matkit_efficiency_single test_matkit_efficiency_single.o $(LIB_DIR)/libsmatkit.so $(LOADFLAGS)
test_matkit_efficiency_single.o: test_matkit_efficiency.cpp $(HEADERS)
$(CPP) $(CFLAGS) $(SFLAGS) -I$(INC_DIR) -c -o test_matkit_efficiency_single.o test_matkit_efficiency.cpp
diff -aruN FILTLAN.orig/OBJ/DOUBLE/Makefile FILTLAN/OBJ/DOUBLE/Makefile
--- FILTLAN.orig/OBJ/DOUBLE/Makefile 2012-04-12 03:35:20.000000000 +0200
+++ FILTLAN/OBJ/DOUBLE/Makefile 2012-12-09 21:43:51.550443553 +0100
@@ -12,7 +12,7 @@
FILTLAN_SRC = $(FILTLAN_DIR)/SRC
-all: $(LIB_DIR)/libdfiltlan.a
+all: $(LIB_DIR)/libdfiltlan.so
# by default, we use double precision (not single precision) floating point numbers
# XFLAGS being nothing means using the default
@@ -43,6 +43,12 @@
fi
$(AR) $(ARFLAGS) $(LIB_DIR)/libdfiltlan.a $(OBJS)
+$(LIB_DIR)/libdfiltlan.so: $(OBJS)
+ if [ ! -d $(LIB_DIR) ]; then \
+ mkdir $(LIB_DIR); \
+fi
+ $(CPP) -shared -Wl,-soname=libdfiltlan.so.0 -o $(LIB_DIR)/libdfiltlan.so $(OBJS)
+
clean:
rm -f *.o $(LIB_DIR)/libdfiltlan.a
diff -aruN FILTLAN.orig/OBJ/SINGLE/Makefile FILTLAN/OBJ/SINGLE/Makefile
--- FILTLAN.orig/OBJ/SINGLE/Makefile 2012-04-12 03:28:19.000000000 +0200
+++ FILTLAN/OBJ/SINGLE/Makefile 2012-12-09 22:04:13.278472543 +0100
@@ -12,7 +12,7 @@
FILTLAN_SRC = $(FILTLAN_DIR)/SRC
-all: $(LIB_DIR)/libsfiltlan.a
+all: $(LIB_DIR)/libsfiltlan.so
XFLAGS = -DUSE_SINGLE
@@ -41,6 +41,12 @@
fi
$(AR) $(ARFLAGS) $(LIB_DIR)/libsfiltlan.a $(OBJS)
+$(LIB_DIR)/libsfiltlan.so: $(OBJS)
+ if [ ! -d $(LIB_DIR) ]; then \
+ mkdir $(LIB_DIR); \
+fi
+ $(CPP) -shared -Wl,-soname=libsfiltlan.so.0 -o $(LIB_DIR)/libsfiltlan.so $(OBJS)
+
clean:
rm -f *.o $(LIB_DIR)/libsfiltlan.a