[libocas] 56/60: Refresh Makefile patch for new upstream version

Christian Kastner chrisk-guest at moszumanska.debian.org
Mon Aug 25 03:34:46 UTC 2014 

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch master
in repository libocas.

commit 803d0d1ea00330618ec9325c36339f4d6022356b
Author: Christian Kastner <debian at kvr.at>
Date:   Sun Aug 24 15:23:11 2014 -0700

    Refresh Makefile patch for new upstream version
---
 ...uild-shared-and-static-libraries-programs.patch | 70 ++++++++++++----------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch b/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
index 3bda3f6..2ee53ec 100644
--- a/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
+++ b/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
@@ -9,19 +9,20 @@ install target.
 Forwarded: no
 Last-Update: 2014-07-26
 ---
- Makefile | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 47 insertions(+), 13 deletions(-)
+ Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 56 insertions(+), 18 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 2ed4145..41924c1 100644
+index f847bf9..8379c16 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -3,11 +3,28 @@ MEX := mex
+@@ -3,12 +3,28 @@ MEX := mex
  MEXFLAGS := $(shell if uname -m | grep -q x86_64 ; then echo -largeArrayDims ; fi)
  MEXSUFFIX := $(shell if uname -m | grep -q x86_64 ; then echo mexa64 ; else echo mexglx ; fi)
  CC := gcc
 -#CFLAGS := -g -lm -Wall -pthread
--CFLAGS := -lm -msse -O3 -fPIC -fstrict-aliasing -fomit-frame-pointer -Wall -pthread
+-CFLAGS := -msse -O3 -fPIC -fstrict-aliasing -fomit-frame-pointer -Wall -pthread
+-CLIBS := -lm
 -#CFLAGS := -lm -msse -O3 -fPIC -fstrict-aliasing -fomit-frame-pointer -Wall
 -#CFLAGS := -lm -msse -O3 -fPIC -fopenmp -fstrict-aliasing -fomit-frame-pointer -Wall
  
@@ -48,28 +49,35 @@ index 2ed4145..41924c1 100644
 +libdest = $(DESTDIR)$(libdir)
  
  ifeq (yes,$(MEXDETECTED))
- all: svmocas.$(MEXSUFFIX) svmlight_linclass.$(MEXSUFFIX) libocas.so svmocas msvmocas linclass msvmocas.$(MEXSUFFIX) compute_errors.$(MEXSUFFIX) lbppyr.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) lbpfilter.$(MEXSUFFIX)
-@@ -43,21 +60,38 @@ lbpfilter.$(MEXSUFFIX): lbpfilter_mex.c
- 
+ all: svmocas_nnw.$(MEXSUFFIX) svmocas.$(MEXSUFFIX) svmocas_light.$(MEXSUFFIX) linclassif_light.$(MEXSUFFIX) libocas.so svmocas msvmocas linclassif msvmocas.$(MEXSUFFIX) msvmocas_light.$(MEXSUFFIX) compute_auc.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) svmocas_bool.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) load_svmlight_file.$(MEXSUFFIX)
+@@ -53,21 +69,43 @@ load_svmlight_file.$(MEXSUFFIX): load_svmlight_file.c lib_svmlight_format.c lib_
+ 		$(MEX) $(MEXFLAGS) -DLIBOCAS_MATLAB -O -output load_svmlight_file.$(MEXSUFFIX) load_svmlight_file.c lib_svmlight_format.c
  
  else 
--all: libocas.so svmocas msvmocas
-+all: $(LIBFILE) svmocas msvmocas linclass libocas.a
+-all: libocas.so svmocas msvmocas linclassif
++all: $(LIBFILE) svmocas msvmocas linclassif libocas.a
  endif
  
--svmocas:	svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c
--		$(CC) $(CFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c libocas.c libqp_splx.c
-+svmocas:	svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h $(LIBFILE)
-+		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
+-svmocas:	svmocas.c svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c features_double.h features_double.c version.h
+-		$(CC) $(CFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c features_double.c libocas.c libqp_splx.c $(CLIBS)
++svmocas:	svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h features_double.h features_double.c version.h $(LIBFILE)
++		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c features_double.c $(PROG_LIBS)
  
--msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c
--		$(CC) $(CFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c libocas.c libqp_splx.c
-+msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h $(LIBFILE)
-+		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
+-msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c features_double.h features_double.c version.h
+-		$(CC) $(CFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c features_double.c libocas.c libqp_splx.c $(CLIBS)
++msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h features_double.h features_double.c version.h $(LIBFILE)
++		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c features_double.c $(PROG_LIBS)
  
- linclass:	linclass.c lib_svmlight_format.c libocas.h 
--		$(CC) $(CFLAGS) -o $@ linclass.c lib_svmlight_format.c  
-+		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ linclass.c lib_svmlight_format.c $(LIBS)
+ linclassif:	linclassif.c lib_svmlight_format.c libocas.h version.h
+-		$(CC) $(CFLAGS) -o $@ linclassif.c lib_svmlight_format.c $(CLIBS)
+-
+-
+-libocas.so:	libocas.c libocas.h libqp_splx.c libqp.h
+-		$(CC) $(CFLAGS) -shared -o $@ libocas.c libqp_splx.c $(CLIBS)
+-
+-clean: 
+-		rm -f *~ svmocas.$(MEXSUFFIX) svmocas_nnw.$(MEXSUFFIX) svmocas_bool.$(MEXSUFFIX) svmocas_light.$(MEXSUFFIX) linclassif_light.$(MEXSUFFIX) svmocas msvmocas linclassif libocas.so msvmocas.$(MEXSUFFIX) msvmocas_light.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) compute_auc.$(MEXSUFFIX) load_svmlight_file.$(MEXSUFFIX)
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ linclassif.c lib_svmlight_format.c $(LIBS)
 +
 +
 +$(LIBFILE):	libocas.c libocas.h libqp_splx.c libqp.h
@@ -78,22 +86,24 @@ index 2ed4145..41924c1 100644
 +			-o $@ libocas.c libqp_splx.c $(LIB_LIBS)
 +		ln -s $@ libocas.so.$(LVER)
 +		ln -s libocas.so.$(LVER) libocas.so
- 
++
 +libocas.a:
 +	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o libocas-static.o libocas.c
 +	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o libqp_splx-static.o libqp_splx.c
 +	ar cru libocas.a libocas-static.o libqp_splx-static.o
- 
--libocas.so:	libocas.c libocas.h libqp_splx.c libqp.h 
--		$(CC) $(CFLAGS) -shared -o $@ libocas.c libqp_splx.c
++
 +install: all
 +	install -d $(bindest) $(libdest)
-+	install svmocas msvmocas linclass -m 755 $(bindest)
++	install svmocas msvmocas linclassif -m 755 $(bindest)
 +	install libocas.a -m 644 $(libdest)
 +	install $(LIBFILE) -m 644 $(libdest)
 +	cd $(libdest) && ln -s $(LIBFILE) libocas.so.$(LVER)
 +	cd $(libdest) && ln -s libocas.so.$(LVER) libocas.so
- 
- clean: 
--		rm -f *~ svmocas.$(MEXSUFFIX) svmlight_linclass.$(MEXSUFFIX) svmocas msvmocas linclass libocas.so msvmocas.$(MEXSUFFIX) lbpfilter.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) lbppyr.$(MEXSUFFIX) compute_errors.$(MEXSUFFIX)
-+		rm -f *~ *.o libocas.a svmocas.$(MEXSUFFIX) svmlight_linclass.$(MEXSUFFIX) svmocas msvmocas linclass libocas.so* msvmocas.$(MEXSUFFIX) lbpfilter.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) lbppyr.$(MEXSUFFIX) compute_errors.$(MEXSUFFIX)
++
++clean:
++	rm -f *~ *.o
++	rm -f svmocas.$(MEXSUFFIX) svmocas_nnw.$(MEXSUFFIX) svmocas_bool.$(MEXSUFFIX) svmocas_light.$(MEXSUFFIX)
++	rm -f linclassif_light.$(MEXSUFFIX)
++	rm -f svmocas msvmocas linclassif libocas.so* libocas.a
++	rm -f msvmocas.$(MEXSUFFIX) msvmocas_light.$(MEXSUFFIX)
++	rm -f lbppyr_features.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) compute_auc.$(MEXSUFFIX) load_svmlight_file.$(MEXSUFFIX)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libocas.git

More information about the debian-science-commits mailing list