|
Lines 1-12
Link Here
|
| 1 |
--- Makefile.orig Tue Feb 2 12:11:37 1999 |
1 |
--- Makefile.orig Wed Feb 3 05:11:37 1999 |
| 2 |
+++ Makefile Sat Jun 26 01:23:37 1999 |
2 |
+++ Makefile Mon Feb 21 20:49:54 2000 |
| 3 |
@@ -1,12 +1,12 @@ |
3 |
@@ -1,12 +1,11 @@ |
| 4 |
-INC = -I/usr/X11R6/include |
4 |
-INC = -I/usr/X11R6/include |
| 5 |
-LIBS = -lXext -lX11 -lm -L/usr/X11R6/lib \ |
5 |
-LIBS = -lXext -lX11 -lm -L/usr/X11R6/lib \ |
| 6 |
- -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster |
6 |
- -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster |
| 7 |
+INC = -I${X11BASE}/include |
7 |
+INC = `get-wraster-flags --cflags` |
| 8 |
+LIBS = -lXext -lX11 -lm -L${X11BASE}/lib -L${LOCALBASE}/lib \ |
8 |
+LIBS = `get-wraster-flags --libs` |
| 9 |
+ -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster |
|
|
| 10 |
OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \ |
9 |
OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \ |
| 11 |
src/sunpos.o src/myconvert.o src/mycontext.o |
10 |
src/sunpos.o src/myconvert.o src/mycontext.o |
| 12 |
|
11 |
|
|
Lines 17-28
Link Here
|
| 17 |
|
16 |
|
| 18 |
all: wmglobe |
17 |
all: wmglobe |
| 19 |
|
18 |
|
| 20 |
@@ -14,7 +14,7 @@ |
19 |
@@ -14,8 +13,7 @@ |
| 21 |
rm -f src/*.o wmglobe |
20 |
rm -f src/*.o wmglobe |
| 22 |
|
21 |
|
| 23 |
wmglobe : $(OBJS) |
22 |
wmglobe : $(OBJS) |
| 24 |
- gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS) |
23 |
- gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS) |
|
|
24 |
- strip wmglobe |
| 25 |
+ ${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS) |
25 |
+ ${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS) |
| 26 |
strip wmglobe |
|
|
| 27 |
|
26 |
|
| 28 |
install : |
27 |
install : |
|
|
28 |
install wmglobe /usr/local/bin |