$NetBSD: patch-br,v 1.2 2004/07/26 11:15:24 dmcmahill Exp $ --- tracer/Makefile.aimk.orig Thu Oct 1 21:13:24 1998 +++ tracer/Makefile.aimk @@ -23,6 +23,7 @@ CFLOPTS = -O #CC = gcc CFLAGS = $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) +LTCC= ${LIBTOOL} --mode=compile ${CC} # @@ -56,10 +57,10 @@ SYSLIBS = $(ARCHLIB) LIBPREFIX = lib PVMLIB = pvm3 -PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a +PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la TRCLIB = pvmtrc -LIBPVMTRC = $(LIBPREFIX)$(TRCLIB).a +LIBPVMTRC = $(LIBPREFIX)$(TRCLIB).la TRCLIBDEP = $(PVMLDIR)/$(LIBPVMTRC) LIBS = $(LIBDIRS) -l$(TRCLIB) -l$(PVMLIB) $(SYSLIBS) @@ -106,32 +107,36 @@ default: local install: $(PVMXDIR) $(PVMLDIR) $(PROGS) $(PVMXDIR)/tracer$(EXESFX): tracer$(EXESFX) - @ cp tracer$(EXESFX) $(PVMXDIR) + ${MKDIR} $(PVMXDIR)/.libs + -cp .libs/tracer$(EXESFX) $(PVMXDIR)/.libs + cp tracer$(EXESFX) $(PVMXDIR) $(PVMXDIR)/trcsort$(EXESFX): trcsort$(EXESFX) - @ cp trcsort$(EXESFX) $(PVMXDIR) + ${MKDIR} $(PVMXDIR)/.libs + -cp .libs/trcsort$(EXESFX) $(PVMXDIR)/.libs + cp trcsort$(EXESFX) $(PVMXDIR) local: tracer$(EXESFX) trcsort$(EXESFX) tracer$(EXESFX): $(OBJS) $(TRCLIBDEP) $(PVMLIBDEP) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + ${LIBTOOL} --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ $(OBJS) $(LIBS) objs: $(OBJS) trcsort$(EXESFX): trcsort.o $(TRCLIBDEP) $(PVMLIBDEP) - $(CC) $(CFLAGS) -o $@ trcsort.o $(LIBS) + ${LIBTOOL} --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ trcsort.lo $(LIBS) trcsort.o: $(SRCDIR)/trcsort.c - $(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcsort.c + $(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcsort.c $(TRCLIBDEP): $(LIBPVMTRC) - @ cp $(LIBPVMTRC) $(PVMLDIR) + ${MKDIR} $(PVMLDIR)/.libs + -cp .libs/* $(PVMLDIR)/.libs + cp $(LIBPVMTRC:.la=.*) $(PVMLDIR) $(LIBPVMTRC): $(TRCOBJS) $(PVMLDIR) - $(AR) rcv $(LIBPVMTRC) $(TRCOBJS) - @ case x$(HASRANLIB) in \ - xt ) echo "ranlib $(LIBPVMTRC)"; ranlib $(LIBPVMTRC) ;; \ - xf ) echo "No Ranlib Necessary." ;; esac + ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${TRCOBJS:.o=.lo} \ + -rpath ${PVM_DIR}/lib/$(PVM_ARCH) -version-info ${PVMLIB_VER} $(PVMXDIR): - mkdir $(PVMBDIR) @@ -156,15 +161,15 @@ veryclean: clean tracer.o: $(SRCDIR)/tracer.c $(HEADERS) @ touch tracer.o - $(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/tracer.c + $(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/tracer.c cmd.o: $(SRCDIR)/cmd.c $(HEADERS) @ touch cmd.o - $(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/cmd.c + $(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/cmd.c trcglob.o: $(SRCDIR)/trcglob.c $(HEADERS) @ touch trcglob.o - $(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcglob.c + $(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcglob.c # @@ -173,25 +178,25 @@ trcglob.o: $(SRCDIR)/trcglob.c $(HEADER trcmess.o: $(TRCDIR)/trcmess.c $(TRCHEADERS) @ touch trcmess.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcmess.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcmess.c trcfile.o: $(TRCDIR)/trcfile.c $(TRCHEADERS) @ touch trcfile.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcfile.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcfile.c trccompat.o: $(TRCDIR)/trccompat.c $(TRCHEADERS) @ touch trccompat.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trccompat.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trccompat.c trccompatglob.o: $(TRCDIR)/trccompatglob.c $(TRCHEADERS) @ touch trccompatglob.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trccompatglob.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trccompatglob.c trcutil.o: $(TRCDIR)/trcutil.c $(TRCHEADERS) @ touch trcutil.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcutil.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcutil.c trclib.o: $(TRCDIR)/trclib.c $(TRCHEADERS) @ touch trclib.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trclib.c + $(LTCC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trclib.c