From e5457c6187efd5f7c57859ad8204bfae19070262 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Thu, 6 Jan 2005 22:34:53 +0000 Subject: [PATCH] Changed Makefiles for Darwin --- lib/Makefile | 6 +++--- mbcico/Makefile | 10 +++++----- mbmon/Makefile | 6 +++--- mbnntp/Makefile | 6 +++--- mbsetup/Makefile | 6 +++--- mbtask/Makefile | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 376f1787..b9b5250f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -48,7 +48,7 @@ OTHER = Makefile README ftscprod.008 mkprod.awk \ README.diesel README.macro Diesel.doc nodelist.conf TARGET = libmbse.a libdbase.a libmsgbase.a libmbinet.a libdiesel.a \ libnodelist.a mbcharsetc charset.bin -LIBS += ../lib/libmbse.a +SLIBS = ../lib/libmbse.a ############################################################################# @@ -84,8 +84,8 @@ libnodelist.a: ${NODELIST_OBJS} ar r $@ $? ${RANLIB} $@ -mbcharsetc: ${CHC_OBJS} - ${CC} -o mbcharsetc ${CHC_OBJS} ${LDFLAGS} ${LIBS} +mbcharsetc: ${CHC_OBJS} ${SLIBS} + ${CC} -o mbcharsetc ${CHC_OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} charset.bin: mbcharsetc ${MAPS} ./mbcharsetc charset.map charset.bin diff --git a/mbcico/Makefile b/mbcico/Makefile index 3a148c30..54a0f5e1 100644 --- a/mbcico/Makefile +++ b/mbcico/Makefile @@ -31,7 +31,7 @@ MBCICO_OBJS = zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o md5b.o \ ttyio.o lutil.o scanout.o emsi.o ulock.o \ callstat.o session.o call.o mbcico.o MBOUT_OBJS = outstat.o nlinfo.o mbout.o scanout.o callstat.o -LIBS += ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libnodelist.a +SLIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libnodelist.a OTHER = Makefile README TARGET = mbcico mbout @@ -51,11 +51,11 @@ install: all @rm -f ${BINDIR}/mbtelind @rm -f ${BINDIR}/mbtelout -mbcico: ${MBCICO_OBJS} ${LIBS} - ${CC} -o mbcico ${MBCICO_OBJS} ${LDFLAGS} ${LIBS} +mbcico: ${MBCICO_OBJS} ${SLIBS} + ${CC} -o mbcico ${MBCICO_OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} -mbout: ${MBOUT_OBJS} ${LIBS} - ${CC} -o mbout ${MBOUT_OBJS} ${LDFLAGS} ${LIBS} +mbout: ${MBOUT_OBJS} ${SLIBS} + ${CC} -o mbout ${MBOUT_OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} filelist: Makefile BASE=`pwd`; \ diff --git a/mbmon/Makefile b/mbmon/Makefile index b3270fd6..5b0c509f 100644 --- a/mbmon/Makefile +++ b/mbmon/Makefile @@ -7,7 +7,7 @@ include ../Makefile.global SRCS = mutil.c mbmon.c proglock.c HDRS = mutil.h mbmon.h proglock.h OBJS = mutil.o mbmon.o proglock.o -LIBS += ../lib/libmbse.a ../lib/libdbase.a +SLIBS = ../lib/libmbse.a ../lib/libdbase.a OTHER = Makefile ############################################################################# @@ -18,8 +18,8 @@ OTHER = Makefile all: mbmon -mbmon: ${OBJS} ${LIBS} - ${CC} -o mbmon ${OBJS} ${LDFLAGS} ${LIBS} +mbmon: ${OBJS} ${SLIBS} + ${CC} -o mbmon ${OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} clean: rm -f mbmon *.o *.h~ *.c~ core filelist Makefile.bak diff --git a/mbnntp/Makefile b/mbnntp/Makefile index adddafb8..ade18136 100644 --- a/mbnntp/Makefile +++ b/mbnntp/Makefile @@ -9,7 +9,7 @@ HDRS = mbnntp.h openport.h ttyio.h auth.h commands.h rfc2ftn.h \ hash.h lhash.h msgflags.h mkftnhdr.h atoul.h OBJS = mbnntp.o openport.o ttyio.o auth.o commands.o rfc2ftn.o \ hash.o lhash.o msgflags.o mkftnhdr.o atoul.o -LIBS += ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a +SLIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a OTHER = Makefile ############################################################################# @@ -20,8 +20,8 @@ OTHER = Makefile all: mbnntp -mbnntp: ${OBJS} ${LIBS} - ${CC} -o mbnntp ${OBJS} ${LDFLAGS} ${LIBS} +mbnntp: ${OBJS} ${SLIBS} + ${CC} -o mbnntp ${OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} clean: rm -f mbnntp *.o *.h~ *.c~ core filelist Makefile.bak diff --git a/mbsetup/Makefile b/mbsetup/Makefile index 25b2cd40..51655560 100644 --- a/mbsetup/Makefile +++ b/mbsetup/Makefile @@ -22,7 +22,7 @@ OBJS = grlist.o m_domain.o m_fgroup.o m_lang.o m_marea.o m_new.o m_protocol.o \ m_magic.o m_mgroup.o m_node.o m_task.o m_users.o screen.o m_bbs.o m_ff.o \ m_hatch.o m_mail.o m_modem.o m_ol.o m_tic.o m_virus.o stlist.o m_bbslist.o \ m_route.o -LIBS += ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libdiesel.a +SLIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libdiesel.a OTHER = Makefile ############################################################################# @@ -33,8 +33,8 @@ OTHER = Makefile all: mbsetup -mbsetup: ${OBJS} ${LIBS} - ${CC} -o mbsetup ${OBJS} ${LDFLAGS} ${LIBS} +mbsetup: ${OBJS} ${SLIBS} + ${CC} -o mbsetup ${OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} clean: rm -f mbsetup *.o *.h~ *.c~ core filelist Makefile.bak diff --git a/mbtask/Makefile b/mbtask/Makefile index 15e7d3b5..42a2d96b 100644 --- a/mbtask/Makefile +++ b/mbtask/Makefile @@ -24,7 +24,7 @@ OTHER = Makefile issue issue.netbsd all: mbtask mbtask: ${OBJS} ${SLIBS} - ${CC} ${CFLAGS} -o mbtask ${OBJS} ${LDFLAGS} ${LIBS} ${LIBS} + ${CC} ${CFLAGS} -o mbtask ${OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} clean: rm -f mbtask *.o *.h~ *.c~ version.* core filelist Makefile.bak