$OpenBSD: patch-stel_Makefile,v 1.1 2001/09/29 21:27:50 naddy Exp $ --- stel/Makefile.orig Sat May 4 18:05:16 1996 +++ stel/Makefile Sat Sep 29 23:02:22 2001 @@ -46,16 +46,13 @@ # OFFSET_T=long for most architectures # OFFSET_T=off_t for POSIX systems -CC = gcc +#CC = gcc DEFS = -DGENERICLOGIN -DCOMBOFLAG $(SYSDEFS) ### -DSECURID -INCDIRS = -I$(DESDIR) -I$(DESCOREDIR) -I$(SKEYDIR) -I$(GMPDIR) $(OTHERINCDIR) ### -I$(SDIDIR) +INCDIRS = -I$(DESCOREDIR) $(OTHERINCDIR) ### -I$(SDIDIR) -DESDIR = ../libdes DESCOREDIR = ../descore #DESCORELIB = -ldescore -SKEYDIR = ../skey -GMPDIR = ../gmp-1.3.2 GNUREGEX = ../regex-0.12 # SOCKS support @@ -68,11 +65,11 @@ GNUREGEX = ../regex-0.12 ###SDILIB = $(SDIDIR)/sdiclient.a ###SDILIB = $(SDIDIR)/sdiclient.a -CFLAGS = -g $(OPTIMIZE) -fwritable-strings $(DEFS) $(INCDIRS) +CFLAGS += $(OPTIMIZE) -fwritable-strings $(DEFS) $(INCDIRS) -LDFLAGS = -g $(OPTIMIZE) -L$(DESDIR) -L$(DESCOREDIR) \ - -L$(GMPDIR) -L$(SKEYDIR) $(SOCKSLIB) $(OTHERLIBDIR) -lskey -ldes \ - -lgmp $(SYSLIBS) -lm -lsocks +LDFLAGS = $(OPTIMIZE) -L$(DESCOREDIR) \ + $(SOCKSLIB) $(OTHERLIBDIR) -lskey -ldes \ + -lgmp $(SYSLIBS) -lm ## -lsocks S5R3OBJ = utmp_init.o utmp_login.o utmp_logout.o updwtmp.o @@ -163,10 +160,11 @@ freebsd: bsdi: make all ALLMASTER="$(BSD4OBJ) $(MASTER)" \ ALLSLAVE="$(SLAVE)" \ - OPTIMIZE="-O2" \ SYSDEFS="-DBSDI -DIDEA32 -DLOGPRI=LOG_INFO -DOFFSET_T=off_t \ -DHAS_SYS_PARAM_H" \ - SYSLIBS="$(DESCORELIB)" + SYSLIBS="$(DESCORELIB)" \ + OTHERINCDIR="-I${LOCALBASE}/include" \ + OTHERLIBDIR="-L${LOCALBASE}/lib" ultrix: make all ALLMASTER="$(BSD4OBJ) $(MASTER)" \ @@ -203,7 +201,7 @@ shar : lint : lint \ -DIDEA32 -DHIGHFIRST -DLOGPRI=LOG_INFO -DOFFSET_T=long \ - -I$(DESDIR) -I$(DESCOREDIR) -I$(SKEYDIR) -I$(GMPDIR) $(DEFS) $(SRC) + -I$(DESCOREDIR) $(DEFS) $(SRC) wc : wc -l $(SRC) $(HDR)