| 1 |
jlec 10/11/29 21:09:09 |
| 2 |
|
| 3 |
Added: 20101129-gentoo.patch |
| 4 |
Log: |
| 5 |
New addition |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/xyza2pipe/files/20101129-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/xyza2pipe/files/20101129-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/xyza2pipe/files/20101129-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 20101129-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Makefile b/Makefile |
| 18 |
index 7e00197..b078f06 100644 |
| 19 |
--- a/Makefile |
| 20 |
+++ b/Makefile |
| 21 |
@@ -4,10 +4,11 @@ |
| 22 |
# Last modified: Jun/30/2010 |
| 23 |
# |
| 24 |
|
| 25 |
-CFLAGS = -O3 -lm |
| 26 |
+CFLAGS ?= -O3 |
| 27 |
+LIBS =-lm |
| 28 |
|
| 29 |
TARGETS = xyza2pipe ucsf2pipe nv2pipe xeasy2pipe azara2pipe vnmr2pipe xwnmr2pipe\ |
| 30 |
- pipe2xyza pipe2ucsf pipe2nv pipe2xeasy pipe2azara\ |
| 31 |
+ pipe2xyza pipe2ucsf-olivia pipe2nv pipe2xeasy pipe2azara-olivia \ |
| 32 |
pipe2proj add2pipe adducsf2pipe addnv2pipe addxeasy2pipe addazara2pipe addvnmr2pipe addxwnmr2pipe |
| 33 |
|
| 34 |
OBJECTS_C = checklabel.o checkxyza.o cnvhdr.o\ |
| 35 |
@@ -60,86 +61,90 @@ clean: |
| 36 |
rm -f $(TARGETS) addxyza2pipe |
| 37 |
|
| 38 |
.o: |
| 39 |
- $(CC) $< -c -o $@ $(CFLAGS) |
| 40 |
+ $(CC) $(CFLAGS) $< -c -o $@ |
| 41 |
|
| 42 |
xyza2pipe: $(OBJECTS_C) $(OBJECTS_XP) |
| 43 |
- $(CC) $@.c $^ -o $@ \ |
| 44 |
- $(CFLAGS) |
| 45 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 46 |
+ $(LIBS) |
| 47 |
|
| 48 |
pipe2xyza: $(OBJECTS_C) $(OBJECTS_PX) |
| 49 |
- $(CC) $@.c $^ -o $@ \ |
| 50 |
- $(CFLAGS) |
| 51 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 52 |
+ $(LIBS) |
| 53 |
|
| 54 |
ucsf2pipe: $(OBJECTS_C) $(OBJECTS_UP) |
| 55 |
- $(CC) $@.c $^ -o $@ \ |
| 56 |
- $(CFLAGS) |
| 57 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 58 |
+ $(LIBS) |
| 59 |
|
| 60 |
-pipe2ucsf: $(OBJECTS_C) $(OBJECTS_PU) |
| 61 |
- $(CC) $@.c $^ -o $@ \ |
| 62 |
- $(CFLAGS) |
| 63 |
+pipe2ucsf-olivia: $(OBJECTS_C) $(OBJECTS_PU) |
| 64 |
+ $(CC) $(CFLAGS) $(LDFLAGS) pipe2ucsf.c $^ -o $@ \ |
| 65 |
+ $(LIBS) |
| 66 |
|
| 67 |
nv2pipe: $(OBJECTS_C) $(OBJECTS_NP) |
| 68 |
- $(CC) $@.c $^ -o $@ \ |
| 69 |
- $(CFLAGS) |
| 70 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 71 |
+ $(LIBS) |
| 72 |
|
| 73 |
pipe2nv: $(OBJECTS_C) $(OBJECTS_PN) |
| 74 |
- $(CC) $@.c $^ -o $@ \ |
| 75 |
- $(CFLAGS) |
| 76 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 77 |
+ $(LIBS) |
| 78 |
|
| 79 |
xeasy2pipe: $(OBJECTS_C) $(OBJECTS_EP) |
| 80 |
- $(CC) $@.c $^ -o $@ \ |
| 81 |
- $(CFLAGS) |
| 82 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 83 |
+ $(LIBS) |
| 84 |
|
| 85 |
pipe2xeasy: $(OBJECTS_C) $(OBJECTS_PE) |
| 86 |
- $(CC) $@.c $^ -o $@ \ |
| 87 |
- $(CFLAGS) |
| 88 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 89 |
+ $(LIBS) |
| 90 |
|
| 91 |
azara2pipe: $(OBJECTS_C) $(OBJECTS_AP) |
| 92 |
- $(CC) $@.c $^ -o $@ \ |
| 93 |
- $(CFLAGS) |
| 94 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 95 |
+ $(LIBS) |
| 96 |
|
| 97 |
-pipe2azara: $(OBJECTS_C) $(OBJECTS_PA) |
| 98 |
- $(CC) $@.c $^ -o $@ \ |
| 99 |
- $(CFLAGS) |
| 100 |
+pipe2azara-olivia: $(OBJECTS_C) $(OBJECTS_PA) |
| 101 |
+ $(CC) $(CFLAGS) $(LDFLAGS) pipe2azara.c $^ -o $@ \ |
| 102 |
+ $(LIBS) |
| 103 |
|
| 104 |
vnmr2pipe: $(OBJECTS_C) $(OBJECTS_VP) |
| 105 |
- $(CC) $@.c $^ -o $@ \ |
| 106 |
- $(CFLAGS) |
| 107 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 108 |
+ $(LIBS) |
| 109 |
|
| 110 |
xwnmr2pipe: $(OBJECTS_C) $(OBJECTS_BP) |
| 111 |
- $(CC) $@.c $^ -o $@ \ |
| 112 |
- $(CFLAGS) |
| 113 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 114 |
+ $(LIBS) |
| 115 |
|
| 116 |
pipe2proj: $(OBJECTS_C) $(OBJECTS_PJ) |
| 117 |
- $(CC) $@.c $^ -o $@ \ |
| 118 |
- $(CFLAGS) |
| 119 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 120 |
+ $(LIBS) |
| 121 |
|
| 122 |
add2pipe: $(OBJECTS_C) $(OBJECTS_DXP) |
| 123 |
- $(CC) $@.c $^ -o $@ \ |
| 124 |
- $(CFLAGS) |
| 125 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 126 |
+ $(LIBS) |
| 127 |
rm -f addxyza2pipe |
| 128 |
ln -s add2pipe addxyza2pipe |
| 129 |
|
| 130 |
adducsf2pipe: $(OBJECTS_C) $(OBJECTS_DUP) |
| 131 |
- $(CC) $@.c $^ -o $@ \ |
| 132 |
- $(CFLAGS) |
| 133 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 134 |
+ $(LIBS) |
| 135 |
|
| 136 |
addnv2pipe: $(OBJECTS_C) $(OBJECTS_DNP) |
| 137 |
- $(CC) $@.c $^ -o $@ \ |
| 138 |
- $(CFLAGS) |
| 139 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 140 |
+ $(LIBS) |
| 141 |
|
| 142 |
addxeasy2pipe: $(OBJECTS_C) $(OBJECTS_DEP) |
| 143 |
- $(CC) $@.c $^ -o $@ \ |
| 144 |
- $(CFLAGS) |
| 145 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 146 |
+ $(LIBS) |
| 147 |
|
| 148 |
addazara2pipe: $(OBJECTS_C) $(OBJECTS_DAP) |
| 149 |
- $(CC) $@.c $^ -o $@ \ |
| 150 |
- $(CFLAGS) |
| 151 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 152 |
+ $(LIBS) |
| 153 |
|
| 154 |
addvnmr2pipe: $(OBJECTS_C) $(OBJECTS_DVP) |
| 155 |
- $(CC) $@.c $^ -o $@ \ |
| 156 |
- $(CFLAGS) |
| 157 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 158 |
+ $(LIBS) |
| 159 |
|
| 160 |
addxwnmr2pipe: $(OBJECTS_C) $(OBJECTS_DBP) |
| 161 |
- $(CC) $@.c $^ -o $@ \ |
| 162 |
- $(CFLAGS) |
| 163 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
| 164 |
+ $(LIBS) |
| 165 |
+ |
| 166 |
+install: $(TARGETS) |
| 167 |
+ install -d $(DESTDIR)/usr/bin |
| 168 |
+ install $(TARGETS) $(DESTDIR)/usr/bin/ |
Archives