cond otp. and use top_builddir
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3874 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -8,13 +8,13 @@ srcdir = @srcdir@
|
|||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
|
|
||||||
topdir = ../../..
|
top_builddir = ../../..
|
||||||
|
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
DEFS = @DEFS@
|
DEFS = @DEFS@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I$(topdir) -I$(top_srcdir) -I$(topdir)/include -I$(top_srcdir)/include -I$(srcdir)/../common @INCLUDE_readline@
|
CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/../common @INCLUDE_readline@
|
||||||
LD_FLAGS = @LD_FLAGS@
|
LD_FLAGS = @LD_FLAGS@
|
||||||
LIB_tgetent = @LIB_tgetent@
|
LIB_tgetent = @LIB_tgetent@
|
||||||
LIBS = @LIBS@ @LIB_readline@
|
LIBS = @LIBS@ @LIB_readline@
|
||||||
@@ -30,9 +30,9 @@ libdir = @libdir@
|
|||||||
transform=@program_transform_name@
|
transform=@program_transform_name@
|
||||||
EXECSUFFIX=@EXECSUFFIX@
|
EXECSUFFIX=@EXECSUFFIX@
|
||||||
|
|
||||||
INCTOP = $(topdir)/include
|
INCTOP = $(top_builddir)/include
|
||||||
|
|
||||||
LIBTOP = $(topdir)/lib
|
LIBTOP = $(top_builddir)/lib
|
||||||
|
|
||||||
PROGS = ftp$(EXECSUFFIX)
|
PROGS = ftp$(EXECSUFFIX)
|
||||||
|
|
||||||
|
@@ -6,7 +6,7 @@ srcdir = @srcdir@
|
|||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
|
|
||||||
topdir = ../../..
|
top_builddir = ../../..
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ LIBTOP = $(ATHENA)/lib
|
|||||||
LIBKAFS = @KRB_KAFS_LIB@
|
LIBKAFS = @KRB_KAFS_LIB@
|
||||||
LIBKRB = -L$(LIBTOP)/krb -lkrb
|
LIBKRB = -L$(LIBTOP)/krb -lkrb
|
||||||
LIBDES = -L$(LIBTOP)/des -ldes
|
LIBDES = -L$(LIBTOP)/des -ldes
|
||||||
LIBOTP = -L$(LIBTOP)/otp -lotp
|
LIBOTP = @LIB_otp@
|
||||||
LIBROKEN= -L$(LIBTOP)/roken -lroken
|
LIBROKEN= -L$(LIBTOP)/roken -lroken
|
||||||
|
|
||||||
PROGS = ftpd$(EXECSUFFIX)
|
PROGS = ftpd$(EXECSUFFIX)
|
||||||
|
@@ -5,6 +5,8 @@ SHELL = /bin/sh
|
|||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
top_builddir = ../..
|
||||||
|
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
AR = ar
|
AR = ar
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
@@ -97,7 +99,7 @@ dist: $(DISTFILES)
|
|||||||
|
|
||||||
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
|
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
|
||||||
LIBROKEN=-L../../lib/roken -lroken
|
LIBROKEN=-L../../lib/roken -lroken
|
||||||
OTPLIB=-L../../lib/otp -lotp
|
OTPLIB=@LIB_otp@
|
||||||
|
|
||||||
popper$(EXECSUFFIX): $(POPPER_OBJECTS)
|
popper$(EXECSUFFIX): $(POPPER_OBJECTS)
|
||||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||||
|
@@ -4,7 +4,7 @@ srcdir = @srcdir@
|
|||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
|
|
||||||
topdir = ../../..
|
top_builddir = ../../..
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
@@ -5,7 +5,7 @@ SHELL = /bin/sh
|
|||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
|
|
||||||
topdir = ../..
|
top_builddir = ../..
|
||||||
|
|
||||||
XINCS = @X_CFLAGS@
|
XINCS = @X_CFLAGS@
|
||||||
XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
|
XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
|
||||||
|
Reference in New Issue
Block a user