Lines 1-6
Link Here
|
1 |
--- Makefile.orig 2010-07-20 19:18:58.000000000 +0200 |
1 |
--- Makefile.orig 2010-07-20 17:18:58 UTC |
2 |
+++ Makefile 2014-02-20 23:32:52.000000000 +0100 |
2 |
+++ Makefile |
3 |
@@ -17,21 +17,21 @@ |
3 |
@@ -17,21 +17,21 @@ TARFILE_NAME = nifticlib-2.0.0 |
4 |
|
4 |
|
5 |
|
5 |
|
6 |
## Compiler defines |
6 |
## Compiler defines |
Lines 17-23
Link Here
|
17 |
+AR ?= ar |
17 |
+AR ?= ar |
18 |
+RANLIB ?= ranlib |
18 |
+RANLIB ?= ranlib |
19 |
+DEPENDFLAGS ?= -MM |
19 |
+DEPENDFLAGS ?= -MM |
20 |
+GNU_ANSI_FLAGS ?= -Wall -ansi -pedantic |
20 |
+GNU_ANSI_FLAGS ?= -ansi -pedantic |
21 |
+ANSI_FLAGS += ${GNU_ANSI_FLAGS} |
21 |
+ANSI_FLAGS += ${GNU_ANSI_FLAGS} |
22 |
+CFLAGS += $(ANSI_FLAGS) |
22 |
+CFLAGS += $(ANSI_FLAGS) |
23 |
|
23 |
|
Lines 34-40
Link Here
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
## Installation |
36 |
## Installation |
37 |
@@ -41,9 +41,9 @@ |
37 |
@@ -41,9 +41,9 @@ INSTALL_INC_DIR = include |
38 |
|
38 |
|
39 |
|
39 |
|
40 |
## Zlib defines |
40 |
## Zlib defines |
Lines 47-53
Link Here
|
47 |
|
47 |
|
48 |
############################################################## |
48 |
############################################################## |
49 |
# platform specific redefines (to use, set ARCH appropriately) |
49 |
# platform specific redefines (to use, set ARCH appropriately) |
50 |
@@ -116,33 +116,33 @@ |
50 |
@@ -116,33 +116,33 @@ clean_all: clean regress_clean_all insta |
51 |
|
51 |
|
52 |
znz: |
52 |
znz: |
53 |
echo "arch is $(ARCH)" |
53 |
echo "arch is $(ARCH)" |
Lines 87-93
Link Here
|
87 |
@echo Utility programs built. |
87 |
@echo Utility programs built. |
88 |
@echo "" |
88 |
@echo "" |
89 |
|
89 |
|
90 |
@@ -152,7 +152,7 @@ |
90 |
@@ -152,7 +152,7 @@ doc: |
91 |
@echo "" |
91 |
@echo "" |
92 |
|
92 |
|
93 |
regress_data: |
93 |
regress_data: |
Lines 96-102
Link Here
|
96 |
@echo "" |
96 |
@echo "" |
97 |
@echo Regression testing data installed. |
97 |
@echo Regression testing data installed. |
98 |
@echo See Testing/README_regress for details. |
98 |
@echo See Testing/README_regress for details. |
99 |
@@ -167,25 +167,25 @@ |
99 |
@@ -167,25 +167,25 @@ $(INSTALL_INC_DIR): |
100 |
$(INSTALL_LIB_DIR): |
100 |
$(INSTALL_LIB_DIR): |
101 |
mkdir -p $@ |
101 |
mkdir -p $@ |
102 |
|
102 |
|
Lines 126-132
Link Here
|
126 |
($(CP) $(FSLIO)/*.a $(INSTALL_LIB_DIR); $(CP) $(FSLIO)/*.h $(INSTALL_INC_DIR);) |
126 |
($(CP) $(FSLIO)/*.a $(INSTALL_LIB_DIR); $(CP) $(FSLIO)/*.h $(INSTALL_INC_DIR);) |
127 |
$(RANLIB) $(INSTALL_LIB_DIR)/*.a |
127 |
$(RANLIB) $(INSTALL_LIB_DIR)/*.a |
128 |
@echo " $(FSLIO) installed." |
128 |
@echo " $(FSLIO) installed." |
129 |
@@ -212,19 +212,19 @@ |
129 |
@@ -212,19 +212,19 @@ fslio_clean: |
130 |
(cd $(FSLIO); $(RM) -f *.o *.a core; $(RM) -f depend.mk;) |
130 |
(cd $(FSLIO); $(RM) -f *.o *.a core; $(RM) -f depend.mk;) |
131 |
|
131 |
|
132 |
examples_clean: |
132 |
examples_clean: |