3da052ca18
will finally fix all of the bulk build problems seen on -current and 2.0 branch machines (1.6 branch has never had problems).
39 lines
1 KiB
Text
39 lines
1 KiB
Text
$NetBSD: patch-bx,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
|
|
|
|
--- rm/Makefile.aimk.orig Thu Aug 28 21:20:11 1997
|
|
+++ rm/Makefile.aimk
|
|
@@ -20,7 +20,7 @@ PVMIDIR = $(PVMDIR)/include
|
|
PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH)
|
|
PVMLIB = pvm3
|
|
LIBPREFIX = lib
|
|
-PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
|
|
+PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
|
|
SDIR = $(PVMDIR)/rm
|
|
BDIR = $(PVMDIR)/bin
|
|
XDIR = $(BDIR)/$(PVM_ARCH)
|
|
@@ -42,6 +42,8 @@ $(XDIR):
|
|
- mkdir $(XDIR)
|
|
|
|
$(XDIR)/srm$(EXESFX): srm$(EXESFX)
|
|
+ ${MKDIR} $(XDIR)/.libs
|
|
+ -cp .libs/srm$(EXESFX) $(XDIR)/.libs
|
|
cp srm$(EXESFX) $(XDIR)
|
|
|
|
|
|
@@ -51,11 +53,14 @@ install: $(XDIR) $(XDIR)/srm$(EXESFX)
|
|
|
|
local: srm$(EXESFX)
|
|
|
|
+LTCC= $(LIBTOOL) --mode=compile $(CC)
|
|
+LTCC_LINK= $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC}
|
|
+
|
|
srm$(EXESFX): srm.o $(XDIR)
|
|
- $(CC) $(CFLAGS) -o $@ srm.o $(LIBS)
|
|
+ $(LTCC_LINK) $(CFLAGS) -o $@ srm.lo $(LIBS)
|
|
|
|
srm.o: $(SDIR)/srm.c $(HEADERS) $(PVMLIBDEP) $(XDIR)
|
|
- $(CC) $(CFLAGS) -c $(SDIR)/srm.c
|
|
+ $(LTCC) $(CFLAGS) -c $(SDIR)/srm.c
|
|
|
|
again:
|
|
cd $(SDIR) ; touch *.c *.h ; make
|