summaryrefslogtreecommitdiff
path: root/parallel/pvm3/patches/patch-am
blob: 4901d64b20c3147ec5f224e2287401c83bd91c90 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
$NetBSD: patch-am,v 1.4 2004/07/19 22:41:16 dmcmahill Exp $

--- xep/Makefile.aimk.orig	Fri Aug 29 14:17:48 1997
+++ xep/Makefile.aimk	Thu Mar 25 03:16:56 2004
@@ -22,9 +22,8 @@
 #CFLOPTS	=	-O
 CFLOPTS		=	-g
-CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
+CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS)
 LIBS		=	-l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
-XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
-XCFLAGS		=	-I/usr/local/X11R5/include -I/usr/local/X11/include \
-				-L/usr/local/X11R5/lib -L/usr/local/X11/lib
+XLIBS		=	-L${X11BASE}/lib -Wl,${RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
+XCFLAGS		=	-I${X11BASE}/include 
 
 HEADERS		=	$(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \
@@ -39,16 +38,23 @@
 	- mkdir $(XDIR)
 
+LTCC=		$(LIBTOOL) --mode=compile $(CC)
+LTCC_LINK=	$(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} -L$(PVMLDIR) 
+
 mmain$(EXESFX):	$(SDIR)/mmain.c $(XDIR) $(PVMLIBDEP)
-	$(CC) $(CFLAGS) -o $@ $(SDIR)/mmain.c $(LIBS)
-	mv $@ $(XDIR)
+	$(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/mmain.c $(LIBS)
+	cp $@ $(XDIR)
 
 mtile$(EXESFX):	$(SDIR)/mtile.c $(XDIR) $(PVMLIBDEP)
-	$(CC) $(CFLAGS) -o $@ $(SDIR)/mtile.c $(LIBS) -lm
-	mv $@ $(XDIR)
+	$(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/mtile.c $(LIBS) -lm
+	${MKDIR} $(XDIR)/.libs
+	-cp .libs/$@ $(XDIR)/.libs
+	cp $@ $(XDIR)
 
 xep$(EXESFX):	xep.o hostc.o calc.o imp.o $(XDIR) $(PVMLIBDEP)
-	$(CC) $(XCFLAGS) $(CFLAGS) -o $@ xep.o calc.o imp.o hostc.o \
+	$(LTCC_LINK) $(XCFLAGS) $(CFLAGS) -o $@ xep.lo calc.lo imp.lo hostc.lo \
 		$(XLIBS) $(LIBS) -lm
-	mv $@ $(XDIR)
+	${MKDIR} $(XDIR)/.libs
+	-cp .libs/$@ $(XDIR)/.libs
+	cp $@ $(XDIR)
 
 clean:
@@ -56,13 +62,13 @@
 
 xep.o:	$(SDIR)/xep.c $(HEADERS)
-	$(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/xep.c
+	$(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/xep.c
 
 imp.o:	$(SDIR)/imp.c $(HEADERS)
-	$(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/imp.c
+	$(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/imp.c
 
 calc.o:	$(SDIR)/calc.c $(HEADERS)
-	$(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/calc.c
+	$(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/calc.c
 
 hostc.o:	$(SDIR)/hostc.c $(HEADERS)
-	$(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/hostc.c
+	$(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/hostc.c