--- src/osdep/unix/Makefile.orig Wed Jan 27 01:17:39 1999 +++ src/osdep/unix/Makefile Sat Feb 27 17:16:00 1999 @@ -100,7 +100,7 @@ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o -CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS) +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) MAKE=make MV=mv RM=rm -rf @@ -115,6 +115,10 @@ PASSWDTYPE=$(PASSWDTYPE) BUILD=$(MAKE) build $(BUILDOPTIONS) +# Need this for the shared library rule to work correctly +.SUFFIXES: .o .so +SOFILES=${BINARIES:.o=.so} + # Here if no make argument established missing: osdep.h @@ -190,7 +194,7 @@ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \ + BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \ BASELDFLAGS="-lcrypt" bsi: # BSD/i386 @@ -606,19 +610,31 @@ # Build it! -build: clean once $(ARCHIVE) +build: clean once $(ARCHIVE) $(SHLIBNAME) -all: $(ARCHIVE) +all: $(ARCHIVE) $(SHLIBNAME) $(ARCHIVE): $(BINARIES) sh -c '$(RM) $(ARCHIVE) || true' @cat ARCHIVE @$(SH) ARCHIVE +$(SHLIBNAME): $(SOFILES) +.if $(PORTOBJFORMAT) == "elf" + ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) +.else + ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) +.endif + ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + +.c.so: osdep.h + $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ + # Cleanup clean: sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' + $(RM) *.so $(SHLIBNAME) # Dependencies @@ -652,7 +668,7 @@ # OS-dependent -osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \ @@ -664,7 +680,12 @@ write.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS + +osdep.o: $(OSDEPS) $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c + +osdep.so: $(OSDEPS) + $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c cat osdepbas.c osdepckp.c osdeplog.c > osdep.c