| 1 |
jlec 10/10/03 08:04:15 |
| 2 |
|
| 3 |
Added: 0.6-gentoo.patch |
| 4 |
Log: |
| 5 |
Respecting LDFLAGS now, 333847; Prefix ready and keyworded for ~-linux |
| 6 |
|
| 7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/easychem/files/0.6-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/easychem/files/0.6-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/easychem/files/0.6-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0.6-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Makefile.linux b/Makefile.linux |
| 18 |
index 6638394..5da56b0 100644 |
| 19 |
--- a/Makefile.linux |
| 20 |
+++ b/Makefile.linux |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
# The C compiler |
| 23 |
-CC=gcc |
| 24 |
+CC ?= gcc |
| 25 |
|
| 26 |
# The following line must be uncommented if you want to specify a place |
| 27 |
# where the 'gs' (or 'pstoedit') program is. |
| 28 |
@@ -25,11 +25,10 @@ GTK_LIBS=`pkg-config --libs gtk+-2.0` |
| 29 |
# The list of important files |
| 30 |
OBJECTS=auxi.o bonds.o easychem.o export.o dialogs.o detect.o library.o drawing.o |
| 31 |
|
| 32 |
-all: easychem po/ |
| 33 |
+all: easychem po |
| 34 |
|
| 35 |
-easychem: postscript/ graph/ $(OBJECTS) |
| 36 |
- $(CC) -o easychem $(OBJECTS) $(GTK_LIBS) $(C_FLAGS) |
| 37 |
- strip easychem |
| 38 |
+easychem: postscript graph $(OBJECTS) |
| 39 |
+ $(CC) $(C_FLAGS) $(LDFLAGS) -o easychem $(OBJECTS) $(GTK_LIBS) |
| 40 |
|
| 41 |
clean: FORCE |
| 42 |
-cd graph; make clean |
| 43 |
@@ -37,7 +36,7 @@ clean: FORCE |
| 44 |
-cd po; make clean |
| 45 |
-rm $(OBJECTS) easychem |
| 46 |
|
| 47 |
-export.o: export.c common.h bonds.h postscript/ |
| 48 |
+export.o: export.c common.h bonds.h postscript |
| 49 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c export.c |
| 50 |
bonds.o: bonds.c common.h bonds.h |
| 51 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c bonds.c |
| 52 |
@@ -49,20 +48,22 @@ library.o: library.c common.h library.h |
| 53 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c library.c |
| 54 |
drawing.o: drawing.c common.h drawing.h |
| 55 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c drawing.c |
| 56 |
-dialogs.o: dialogs.c common.h dialogs.h graph/ |
| 57 |
+dialogs.o: dialogs.c common.h dialogs.h graph |
| 58 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c dialogs.c |
| 59 |
detect.o: detect.c common.h detect.h |
| 60 |
$(CC) $(GTK_FLAGS) $(C_FLAGS) -c detect.c |
| 61 |
|
| 62 |
# The rules for subdirectories |
| 63 |
-graph/: FORCE |
| 64 |
- cd graph; make all |
| 65 |
+graph: |
| 66 |
+ +make -C $@ |
| 67 |
|
| 68 |
-postscript/: FORCE |
| 69 |
- cd postscript; make all |
| 70 |
+postscript: |
| 71 |
+ +make -C $@ |
| 72 |
|
| 73 |
-po/: FORCE |
| 74 |
- cd po; make all |
| 75 |
+po: |
| 76 |
+ +make -C $@ |
| 77 |
|
| 78 |
# This is used to force an update |
| 79 |
FORCE: |
| 80 |
+ |
| 81 |
+.PHONY: graph postscript po |
Archives