summaryrefslogtreecommitdiffstats
path: root/src/plugins/kdb
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/kdb')
-rw-r--r--src/plugins/kdb/db2/Makefile.in14
-rw-r--r--src/plugins/kdb/db2/libdb2/Makefile.in2
-rw-r--r--src/plugins/kdb/db2/libdb2/test/Makefile.in5
-rw-r--r--src/plugins/kdb/hdb/Makefile.in15
-rw-r--r--src/plugins/kdb/ldap/Makefile.in10
-rw-r--r--src/plugins/kdb/ldap/ldap_util/Makefile.in3
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/Makefile.in8
7 files changed, 2 insertions, 55 deletions
diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index 6dd9e2ef5b..dac32752c0 100644
--- a/src/plugins/kdb/db2/Makefile.in
+++ b/src/plugins/kdb/db2/Makefile.in
@@ -1,11 +1,6 @@
mydir=plugins$(S)kdb$(S)db2
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
SUBDIRS= $(SUBDIRS-@DB_VERSION@)
SUBDIRS-sys=
@@ -29,7 +24,6 @@ DB_DEPLIB-sys =
LIBBASE=db2
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/db2
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -39,9 +33,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
DBDIR = libdb2
DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@)
DBOBJLISTS-sys =
@@ -74,11 +65,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
-#lib$(LIBBASE)$(SO_EXT): db2_exp.o
-# $(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS)
-
clean::
- $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o .depend-verify-db
+ $(RM) .depend-verify-db
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index d2df68c79c..0de98a9f4f 100644
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -15,8 +15,6 @@ HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h
SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
all-unix:: includes all-libs
all-prerecurse depend-prerecurse: $(HDRS)
diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index 854d50d36a..24adcbe996 100644
--- a/src/plugins/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -8,9 +8,6 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
-I$(srcdir)/../btree -I$(srcdir)/../hash -I$(srcdir)/../db
PROG_LIBPATH=-L.. -L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
DB_LIB = -ldb
DB_DEPLIB = ../libdb$(DEPLIBEXT)
@@ -21,7 +18,7 @@ dbtest: dbtest.o $(DB_DEPLIB)
$(CC_LINK) -o $@ dbtest.o $(STRERROR_OBJ) $(DB_LIB)
check:: dbtest
- $(KRB5_RUN_ENV) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
+ $(RUN_SETUP) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
bttest.o: $(srcdir)/btree.tests/main.c
$(CC) $(ALL_CFLAGS) -c $(srcdir)/btree.tests/main.c -o $@
diff --git a/src/plugins/kdb/hdb/Makefile.in b/src/plugins/kdb/hdb/Makefile.in
index 12ec6fd6a3..bf52f10a73 100644
--- a/src/plugins/kdb/hdb/Makefile.in
+++ b/src/plugins/kdb/hdb/Makefile.in
@@ -1,11 +1,6 @@
mydir=plugins$(S)kdb$(S)hdb
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
DB_VERSION = @DB_VERSION@
LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb
@@ -14,7 +9,6 @@ DEFINES = -DPLUGIN -DSHLIBEXT=\"$(SHLIBEXT)\"
LIBBASE=hdb
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/hdb
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -25,15 +19,11 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkdb5 -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
SRCS= \
$(srcdir)/kdb_hdb.c \
$(srcdir)/kdb_marshal.c \
$(srcdir)/kdb_windc.c
-STOBJLISTS=OBJS.ST $(DBOBJLISTS)
STLIBOBJS= \
kdb_hdb.o \
kdb_marshal.o \
@@ -43,11 +33,6 @@ all-unix:: all-liblinks
install-unix:: install-libs
clean-unix:: clean-liblinks clean-libs clean-libobjs
-$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
-
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in
index 36a03e2aa7..3dd4ba6bb7 100644
--- a/src/plugins/kdb/ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/Makefile.in
@@ -1,10 +1,5 @@
mydir=plugins$(S)kdb$(S)ldap
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS =
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
SUBDIRS= libkdb_ldap
@@ -15,7 +10,6 @@ LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb \
LIBBASE=kldap
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/ldap
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -26,15 +20,11 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT) \
$(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(SHLIBEXT)
SHLIB_EXPLIBS= -lkdb_ldap $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto -lkrb5support $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
SRCS= $(srcdir)/ldap_exp.c
$(TOPLIBD)/libkdb_ldap$(SHLIBEXT) : all-recurse
-
-STOBJLISTS=OBJS.ST
STLIBOBJS= ldap_exp.o
all-unix:: all-liblinks
diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in
index 73a4c67866..b9ea339057 100644
--- a/src/plugins/kdb/ldap/ldap_util/Makefile.in
+++ b/src/plugins/kdb/ldap/ldap_util/Makefile.in
@@ -1,10 +1,7 @@
mydir=plugins$(S)kdb$(S)ldap$(S)ldap_util
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFINES = -DKDB4_DISABLE
-DEFS=
LOCALINCLUDES = -I. -I$(srcdir)/../libkdb_ldap -I$(top_srcdir)/lib/kdb
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)
#KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
KDB_DEP_LIB=$(DL_LIB) -lkdb_ldap $(THREAD_LINKOPTS)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
index fd65da8cc2..d302cf2f96 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
@@ -1,9 +1,5 @@
mydir=plugins$(S)kdb$(S)ldap$(S)libkdb_ldap
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
# Lots of ugliness here because of duplicated symbol names.
# Can I just punt the duplicates and import from libkdb5, or
# is keeping them separate important?
@@ -12,7 +8,6 @@ DEFINES = \
-Dkrb5_dbe_lookup_tl_data=kdb_ldap_dbe_lookup_tl_data \
-Dkrb5_dbe_update_last_pwd_change=kdb_ldap_dbe_update_last_pwd_change \
-Dkrb5_dbe_update_tl_data=kdb_ldap_dbe_update_tl_data
-DEFS=
LOCALINCLUDES = -I$(top_srcdir)/lib/kdb -I$(top_srcdir)/lib/krb5/asn.1
@@ -28,8 +23,6 @@ SHLIB_EXPDEPS = \
$(SUPPORT_DEPLIB) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(KADMSRV_LIBS) -lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) $(LDAP_LIBS) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
LIBINITFUNC= kldap_init_fn
LIBFINIFUNC=
@@ -51,7 +44,6 @@ SRCS= $(srcdir)/kdb_ldap.c \
$(srcdir)/ldap_err.c \
$(srcdir)/lockout.c \
-STOBJLISTS=OBJS.ST
STLIBOBJS= kdb_ldap.o \
kdb_ldap_conn.o \
ldap_realm.o \
generated by cgit (git 2.34.1) at 2024-06-02 18:19:17 +0000