diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-05-16 14:21:12 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-05-16 20:09:27 -0400 |
| commit | 4b0985f8573840838bcfa8ec1df3dcd39a3dbf15 (patch) | |
| tree | a9ac284b8ef9000f968cb610cc8ff79061e8293b /src/plugins/kdb/ldap/libkdb_ldap | |
| parent | 780b34cd19c0360458395e87f35550e9803a5194 (diff) | |
| download | krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.tar.gz krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.tar.xz krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.zip | |
Reduce boilerplate in makefiles
Provide default values in pre.in for PROG_LIBPATH, PROG_RPATH,
SHLIB_DIRS, SHLIB_RDIRS, and STOBJLISTS so that they don't have to be
specified in the common case. Rename KRB5_RUN_ENV and KRB5_RUN_VARS
to RUN_SETUP (already the most commonly used name) and RUN_VARS. Make
sure to use DEFINES for local defines (not DEFS). Remove some other
unnecessary makefile content.
Diffstat (limited to 'src/plugins/kdb/ldap/libkdb_ldap')
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/Makefile.in | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in index fd65da8cc..d302cf2f9 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 \ |