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).
44 lines
1.4 KiB
Text
44 lines
1.4 KiB
Text
$NetBSD: patch-bs,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
|
|
|
|
--- console/Makefile.aimk.orig Thu Aug 28 18:12:54 1997
|
|
+++ console/Makefile.aimk
|
|
@@ -20,8 +20,8 @@ TRCLDIR = $(TRCDIR)/$(PVM_ARCH)
|
|
PVMLIB = pvm3
|
|
TRCLIB = pvmtrc
|
|
LIBPREFIX = lib
|
|
-PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
|
|
-TRCLIBDEP = $(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).a
|
|
+PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
|
|
+TRCLIBDEP = $(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).la
|
|
CFLAGS = $(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \
|
|
-I$(PVMSDIR) $(ARCHCFLAGS)
|
|
LIBS = $(LOPT) -L$(TRCLDIR) -L$(PVMLDIR) \
|
|
@@ -36,19 +36,23 @@ $(PVMLDIR):
|
|
- mkdir $(PVMLDIR)
|
|
|
|
$(PVMLDIR)/pvm$(EXESFX): pvm$(EXESFX)
|
|
+ ${MKDIR} $(PVMLDIR)/.libs
|
|
+ -cp .libs/pvm$(EXESFX) $(PVMLDIR)/.libs
|
|
cp pvm$(EXESFX) $(PVMLDIR)
|
|
|
|
+LTCC= ${LIBTOOL} --mode=compile ${CC}
|
|
+
|
|
pvm$(EXESFX): $(OBJ) $(PVMLIBDEP) $(TRCLIBDEP)
|
|
- $(CC) $(CFLAGS) -o pvm$(EXESFX) $(OBJ) $(LIBS)
|
|
+ ${LIBTOOL} --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o pvm$(EXESFX) $(OBJ:.o=.lo) $(LIBS)
|
|
|
|
cons.o: $(SDIR)/cons.c
|
|
- $(CC) $(CFLAGS) -c $(SDIR)/cons.c
|
|
+ $(LTCC) $(CFLAGS) -c $(SDIR)/cons.c
|
|
cmds.o: $(SDIR)/cmds.c
|
|
- $(CC) $(CFLAGS) -c $(SDIR)/cmds.c
|
|
+ $(LTCC) $(CFLAGS) -c $(SDIR)/cmds.c
|
|
job.o: $(SDIR)/job.c
|
|
- $(CC) $(CFLAGS) -c $(SDIR)/job.c
|
|
+ $(LTCC) $(CFLAGS) -c $(SDIR)/job.c
|
|
trc.o: $(SDIR)/trc.c
|
|
- $(CC) $(CFLAGS) -c $(SDIR)/trc.c
|
|
+ $(LTCC) $(CFLAGS) -c $(SDIR)/trc.c
|
|
|
|
clean:
|
|
rm -f *.o pvm$(EXESFX)
|