| 1 |
jlec 10/10/30 13:44:13 |
| 2 |
|
| 3 |
Added: 1.2-gentoo.patch |
| 4 |
Log: |
| 5 |
New addition |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/threeV/files/1.2-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/threeV/files/1.2-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/threeV/files/1.2-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.2-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/src/Makefile b/src/Makefile |
| 18 |
index a58462c..616f51a 100644 |
| 19 |
--- a/src/Makefile |
| 20 |
+++ b/src/Makefile |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
-CC = g++ |
| 23 |
-EXT=$(shell ./cpuflags.pl --opt ) |
| 24 |
-FLAGS = -Wall $(EXT) |
| 25 |
-#FLAGS = -O3 -Wall -ffast-math |
| 26 |
+CXX ?= g++ |
| 27 |
+#EXT=$(shell ./cpuCXXFLAGS.pl --opt ) |
| 28 |
+#CXXFLAGS = -Wall $(EXT) |
| 29 |
+#CXXFLAGS = -O3 -Wall -ffast-math |
| 30 |
OBJS = utils-main.o utils-output.o utils-mrc.o |
| 31 |
|
| 32 |
all: cav chan fsv sol tun vdw vol |
| 33 |
@@ -17,54 +17,65 @@ volume: vol |
| 34 |
objects: utils-main.o utils-output.o utils-mrc.o |
| 35 |
|
| 36 |
cav: objects cavities.cpp |
| 37 |
- $(CC) $(FLAGS) -o Cavities.exe $(OBJS) cavities.cpp |
| 38 |
- chmod 777 Cavities.exe |
| 39 |
- mv Cavities.exe ../bin |
| 40 |
+ $(CXX) $(CXXFLAGS) -c -o cavities.o cavities.cpp |
| 41 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o Cavities $(OBJS) cavities.o |
| 42 |
+ chmod 755 Cavities |
| 43 |
+ mv Cavities ../bin |
| 44 |
|
| 45 |
chan: objects channel.cpp |
| 46 |
- $(CC) $(FLAGS) -o Channel.exe $(OBJS) channel.cpp |
| 47 |
- chmod 777 Channel.exe |
| 48 |
- mv Channel.exe ../bin |
| 49 |
+ $(CXX) $(CXXFLAGS) -c -o channel.o channel.cpp |
| 50 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o Channel $(OBJS) channel.o |
| 51 |
+ chmod 755 Channel |
| 52 |
+ mv Channel ../bin |
| 53 |
|
| 54 |
fsv: objects fsv_calc.cpp |
| 55 |
- $(CC) $(FLAGS) -o FsvCalc.exe $(OBJS) fsv_calc.cpp |
| 56 |
- chmod 777 FsvCalc.exe |
| 57 |
- mv FsvCalc.exe ../bin |
| 58 |
+ $(CXX) $(CXXFLAGS) -c -o fsv_calc.o fsv_calc.cpp |
| 59 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o FsvCalc $(OBJS) fsv_calc.o |
| 60 |
+ chmod 755 FsvCalc |
| 61 |
+ mv FsvCalc ../bin |
| 62 |
|
| 63 |
sol: objects solvent.cpp |
| 64 |
- $(CC) $(FLAGS) -o Solvent.exe $(OBJS) solvent.cpp |
| 65 |
- chmod 777 Solvent.exe |
| 66 |
- mv Solvent.exe ../bin |
| 67 |
+ $(CXX) $(CXXFLAGS) -c -o solvent.o solvent.cpp |
| 68 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o Solvent $(OBJS) solvent.o |
| 69 |
+ chmod 755 Solvent |
| 70 |
+ mv Solvent ../bin |
| 71 |
|
| 72 |
tun: objects tunnel.cpp |
| 73 |
- $(CC) $(FLAGS) -o Tunnel.exe $(OBJS) tunnel.cpp |
| 74 |
- chmod 777 Tunnel.exe |
| 75 |
- mv Tunnel.exe ../bin |
| 76 |
+ $(CXX) $(CXXFLAGS) -c -o tunnel.o tunnel.cpp |
| 77 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o Tunnel $(OBJS) tunnel.o |
| 78 |
+ chmod 755 Tunnel |
| 79 |
+ mv Tunnel ../bin |
| 80 |
|
| 81 |
vdw: objects vdw.cpp |
| 82 |
- $(CC) $(FLAGS) -o VDW.exe $(OBJS) vdw.cpp |
| 83 |
- chmod 777 VDW.exe |
| 84 |
- mv VDW.exe ../bin |
| 85 |
+ $(CXX) $(CXXFLAGS) -c -o vdw.o vdw.cpp |
| 86 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o VDW $(OBJS) vdw.o |
| 87 |
+ chmod 755 VDW |
| 88 |
+ mv VDW ../bin |
| 89 |
|
| 90 |
vol: objects volume.cpp |
| 91 |
- $(CC) $(FLAGS) -o Volume.exe $(OBJS) volume.cpp |
| 92 |
- chmod 777 Volume.exe |
| 93 |
- mv Volume.exe ../bin |
| 94 |
+ $(CXX) $(CXXFLAGS) -c -o volume.o volume.cpp |
| 95 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o Volume $(OBJS) volume.o |
| 96 |
+ chmod 755 Volume |
| 97 |
+ mv Volume ../bin |
| 98 |
|
| 99 |
utils-main.o: utils-main.cpp |
| 100 |
- $(CC) $(FLAGS) -c -o utils-main.o utils-main.cpp |
| 101 |
+ $(CXX) $(CXXFLAGS) -c -o utils-main.o utils-main.cpp |
| 102 |
|
| 103 |
utils-output.o: utils-main.o utils-output.cpp |
| 104 |
- $(CC) $(FLAGS) -c -o utils-output.o utils-output.cpp |
| 105 |
+ $(CXX) $(CXXFLAGS) -c -o utils-output.o utils-output.cpp |
| 106 |
|
| 107 |
utils-mrc.o: utils-mrc.cpp |
| 108 |
- $(CC) $(FLAGS) -c -o utils-mrc.o utils-mrc.cpp |
| 109 |
+ $(CXX) $(CXXFLAGS) -c -o utils-mrc.o utils-mrc.cpp |
| 110 |
+ |
| 111 |
+install: |
| 112 |
+ install -d $(DESTDIR)/usr/bin |
| 113 |
+ install ../bin/* $(DESTDIR)/usr/bin/ |
| 114 |
|
| 115 |
clean: |
| 116 |
rm -fv *.o *~ |
| 117 |
|
| 118 |
distclean: |
| 119 |
- rm -fv *.o ../bin/*.exe *~ |
| 120 |
+ rm -fv *.o ../bin/* *~ |
| 121 |
|
| 122 |
none: |
| 123 |
echo "Please type make xxx, where xxx = cav, cha, fsv, sol, tun, vdw, or vol" |
Archives