1 |
jlec 12/07/05 13:50:48 |
2 |
|
3 |
Added: 7.0.8-parallel.patch |
4 |
Log: |
5 |
sci-chemistry/mosflm: Version Bump, drop old |
6 |
|
7 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/mosflm/files/7.0.8-parallel.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/7.0.8-parallel.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/7.0.8-parallel.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 7.0.8-parallel.patch |
16 |
=================================================================== |
17 |
Makefile | 21 ++++++++++----------- |
18 |
cbf/Makefile | 9 +++++++-- |
19 |
2 files changed, 17 insertions(+), 13 deletions(-) |
20 |
|
21 |
diff --git a/Makefile b/Makefile |
22 |
index 3d2f543..2219d8d 100644 |
23 |
--- a/Makefile |
24 |
+++ b/Makefile |
25 |
@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a |
26 |
CBFLIBS = cbf/lib/libcbf.a |
27 |
JPGLIBS = jpg/libjpeg.a |
28 |
|
29 |
-all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) |
30 |
- cd mosflm ; make |
31 |
+all: $(DPSLIBS) |
32 |
+ $(MAKE) -C mosflm |
33 |
|
34 |
dpslibs: |
35 |
@-find . -name "*a" -delete |
36 |
@@ -32,22 +32,21 @@ dpslibs: |
37 |
|
38 |
cbflibs: |
39 |
@-find ./cbf -name "*.a" -delete |
40 |
- cd cbf ; make all ; if [ -f $(RANLIB) ]; \ |
41 |
- then $(RANLIB) lib/libcbf.a; fi |
42 |
+ $(MAKE) -C cbf all |
43 |
|
44 |
jpglibs: |
45 |
- cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a |
46 |
+ cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a |
47 |
|
48 |
${DPSLIBS}: |
49 |
- make dpslibs |
50 |
+ $(MAKE) dpslibs |
51 |
|
52 |
${CBFLIBS}: |
53 |
- make cbflibs |
54 |
+ $(MAKE) cbflibs |
55 |
|
56 |
${JPGLIBS}: |
57 |
- make jpglibs |
58 |
+ $(MAKE) jpglibs |
59 |
|
60 |
-libs: ${DPSLIBS} ${CBFLIBS} ${JPGLIBS} |
61 |
+libs: ${DPSLIBS} ${CBFLIBS} |
62 |
@echo "****************************************************************" |
63 |
@echo " Making libraries for system ${HOSTTYPE}" |
64 |
@echo "****************************************************************" |
65 |
@@ -56,11 +55,11 @@ ipmosflm: libs |
66 |
@echo "****************************************************************" |
67 |
@echo " Making IPMOSFLM for system ${HOSTTYPE}" |
68 |
@echo "****************************************************************" |
69 |
- cd mosflm ; make ipmosflm |
70 |
+ $(MAKE) -C mosflm ipmosflm |
71 |
|
72 |
force: |
73 |
@-rm -f bin/ipmosflm |
74 |
- make ipmosflm |
75 |
+ $(MAKE) ipmosflm |
76 |
|
77 |
install: |
78 |
@echo "the executable is in ${MOSHOME}/bin/ipmosflm" |
79 |
diff --git a/cbf/Makefile b/cbf/Makefile |
80 |
index e61497c..c3c94ac 100644 |
81 |
--- a/cbf/Makefile |
82 |
+++ b/cbf/Makefile |
83 |
@@ -362,6 +362,8 @@ HEADERS = $(INCLUDE)/cbf.h \ |
84 |
$(EXAMPLES)/img.h \ |
85 |
$(INCLUDE)/md5.h |
86 |
|
87 |
+OBJ = $(subst .c,.o,$(SOURCE)) |
88 |
+ |
89 |
# |
90 |
# Compile the library and examples |
91 |
# |
92 |
@@ -379,11 +381,14 @@ $(INSTALLDIR): |
93 |
$(LIB): |
94 |
mkdir $(LIB) |
95 |
|
96 |
+ |
97 |
+.c.o: $(SOURCE) $(HEADERS) |
98 |
+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< |
99 |
+ |
100 |
# |
101 |
# CBF library |
102 |
# |
103 |
-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) |
104 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
105 |
+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) |
106 |
$(AR) cr $@ *.o |
107 |
rm *.o |
108 |
if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi |