1fabcf5e84
* Don't use libtool; it's not necessary here (and increases compile time)
* Obey ${CC} and ${CFLAGS}.
61 lines
2.1 KiB
Text
61 lines
2.1 KiB
Text
$NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
|
|
|
|
--- pine/makefile.neb.orig Tue Jul 3 19:03:58 2001
|
|
+++ pine/makefile.neb Mon Oct 8 10:05:52 2001
|
|
@@ -45,11 +45,13 @@
|
|
RM= rm -f
|
|
LN= ln -s
|
|
MAKE= make
|
|
OPTIMIZE= # -O
|
|
PROFILE= # -pg
|
|
-DEBUG= -g -DDEBUG
|
|
+DEBUG= -DDEBUG # -g # XXX crashes on 'c'ompose w/o -DDEBUG
|
|
|
|
-CCLIENTDIR= ../c-client
|
|
+CCLIENTDIR= ${LOCALBASE}
|
|
+CCLIENTINC= ${CCLIENTDIR}/include/c-client
|
|
+CCLIENTLIB= ${CCLIENTDIR}/lib
|
|
PICODIR= ../pico
|
|
|
|
# Only need to uncomment next two lines if you run make from this directory
|
|
@@ -60,14 +65,13 @@
|
|
LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
|
|
mailview.o other.o pine.o strings.o takeaddr.o
|
|
|
|
-STDLIBS= -ltermlib
|
|
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
|
|
-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
|
|
- `cat $(CCLIENTDIR)/LDFLAGS`
|
|
+STDLIBS= -ltermlib -lssl -lcrypto -lcrypt
|
|
+LOCLIBS= -lpico -lc-client
|
|
+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
|
|
|
|
STDCFLAGS= -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
|
|
CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
|
|
- $(STDCFLAGS)
|
|
+ $(STDCFLAGS) -I${CCLIENTINC}
|
|
|
|
OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
|
|
folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
|
|
@@ -79,8 +83,8 @@
|
|
$(PICODIR)/headers.h $(PICODIR)/estruct.h \
|
|
$(PICODIR)/edef.h $(PICODIR)/efunc.h \
|
|
$(PICODIR)/pico.h $(PICODIR)/os.h \
|
|
- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
|
|
- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
|
|
+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
|
|
+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
|
|
|
|
all: pine rpload rpdump
|
|
|
|
@@ -112,8 +116,8 @@
|
|
|
|
$(OFILES): $(HFILES)
|
|
addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
|
|
-context.o: $(CCLIENTDIR)/misc.h
|
|
-send.o: $(CCLIENTDIR)/smtp.h
|
|
+context.o: $(CCLIENTINC)/misc.h
|
|
+send.o: $(CCLIENTINC)/smtp.h
|
|
#$(LDAPOFILES): $(LDAPLIBS)
|
|
|
|
helptext.c: pine.hlp
|