Mercurial > mxe-octave

annotate src/of-fits-1-cross-fixes.patch @ 3952:6349e1b15144

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag release-4-0-0 for changeset 1cab2860069e
author John W. Eaton <jwe@octave.org>
date Wed, 27 May 2015 16:20:22 -0400
parents 85568f3159a4
children 414c464563c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
1 diff -ur fits.orig/src/Makefile fits/src/Makefile
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
2 --- fits.orig/src/Makefile 2015-03-20 13:37:26.766478760 -0400
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
3 +++ fits/src/Makefile 2015-03-20 13:39:14.198586323 -0400
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
4 @@ -1,4 +1,6 @@
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
5 -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
6 +MKOCTFILE ?= mkoctfile
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
7 +PKG_CONFIG ?= pkg-config
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
8 +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
9
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
10 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
11
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
12 @@ -6,5 +8,5 @@
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
13 rm -f *.oct *.o
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
14
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
15 %.oct: %.cc
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
16 - mkoctfile --verbose -Wall $(MKOCT_FLAGS) $<
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
17 + $(MKOCTFILE) --verbose -Wall $(MKOCT_FLAGS) $<
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
18