Skip to content

Commit

Permalink
Remove unused build system variables
Browse files Browse the repository at this point in the history
  • Loading branch information
greghudson committed May 17, 2013
1 parent 30dd0b1 commit 780b34c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 34 deletions.
31 changes: 2 additions & 29 deletions src/config/pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,8 @@ DEFS = @DEFS@
CC = @CC@
CXX = @CXX@
LD = $(PURE) @LD@
DEPLIBS = @DEPLIBS@
KRB_INCLUDES = -I$(BUILDTOP)/include -I$(top_srcdir)/include
LDFLAGS = @LDFLAGS@
LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@
LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@
LDARGS = @LDARGS@
LIBS = @LIBS@

INSTALL=@INSTALL@
Expand All @@ -193,7 +189,6 @@ INSTALL_PREFIX=$(prefix)
INSTALL_EXEC_PREFIX=@exec_prefix@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
SHLIB_TAIL_COMP=@SHLIB_TAIL_COMP@

datadir = @datadir@
EXAMPLEDIR = $(datadir)/examples/krb5
Expand All @@ -212,7 +207,6 @@ SERVER_CATDIR = $(KRB5MANROOT)/cat8
CLIENT_CATDIR = $(KRB5MANROOT)/cat1
FILE_CATDIR = $(KRB5MANROOT)/cat5
KRB5_LIBDIR = @libdir@
KRB5_SHLIBDIR = @libdir@$(SHLIB_TAIL_COMP)
KRB5_INCDIR = @includedir@
MODULE_DIR = @libdir@/krb5/plugins
KRB5_DB_MODULE_DIR = $(MODULE_DIR)/kdb
Expand All @@ -233,10 +227,6 @@ KRB5_INCSUBDIRS = \
#
TESTDIR = $(BUILDTOP)/kadmin/testing
STESTDIR = $(top_srcdir)/kadmin/testing
COMPARE_DUMP = $(TESTDIR)/scripts/compare_dump.pl
INITDB = $(STESTDIR)/scripts/init_db
MAKE_KEYTAB = $(TESTDIR)/scripts/make-host-keytab.pl
LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl
ENV_SETUP = $(TESTDIR)/scripts/env-setup.sh
CLNTTCL = $(TESTDIR)/util/kadm5_clnt_tcl
SRVTCL = $(TESTDIR)/util/kadm5_srv_tcl
Expand Down Expand Up @@ -265,14 +255,8 @@ transform = @program_transform_name@
RM = rm -f
CP = cp
MV = mv -f
LN = ln
CHMOD=chmod
RANLIB = @RANLIB@
ARCHIVE = @ARCHIVE@
ARADD = @ARADD@
AWK = @AWK@
LEX = @LEX@
LEXLIB = @LEXLIB@
YACC = @YACC@
PERL = @PERL@
PYTHON = @PYTHON@
Expand All @@ -282,14 +266,9 @@ AUTOHEADER = autoheader
AUTOHEADERFLAGS =
MOVEIFCHANGED = $(top_srcdir)/config/move-if-changed

SHEXT = @SHEXT@
STEXT=@STEXT@
VEXT=@VEXT@

TOPLIBD = $(BUILDTOP)/lib

OBJEXT = o
LIBEXT = a
EXEEXT =

#
Expand Down Expand Up @@ -414,9 +393,6 @@ KADM_COMM_LIBS = $(GSSRPC_LIBS)
KADMSRV_LIBS = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS)
KADMCLNT_LIBS = -lkadm5clnt_mit $(KADM_COMM_LIBS)

# libutil for NetBSD, et al. for openpty(), etc.
UTIL_LIB = @UTIL_LIB@

# Misc stuff for linking server programs (and maybe some others,
# eventually) but which we don't want to install.
APPUTILS_LIB = -lapputils
Expand Down Expand Up @@ -506,8 +482,8 @@ MAKE_COMMANDS-k5= $(BUILDTOP)/util/ss/mk_cmds
LN_S=@LN_S@
AR=@AR@

# Set to "lib$(LIBBASE)$(STEXT) lib$(LIBBASE)$(SHEXT) lib$(LIBBASE)$(PFEXT)" or
# some subset thereof by configure; determines which types of libs get
# Set to "lib$(LIBBASE)$(STLIBEXT) lib$(LIBBASE)$(SHLIBEXT)" or some
# subset thereof by configure; determines which types of libs get
# built.
LIBLIST=@LIBLIST@

Expand Down Expand Up @@ -583,9 +559,6 @@ OBJLISTS=@OBJLISTS@
SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)

# "$(CC) -G", "$(LD) -Bshareable", etc.
LDCOMBINE=@LDCOMBINE@

#
# rules to make various types of object files
#
Expand Down
3 changes: 0 additions & 3 deletions src/config/win-pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,8 @@ KRB4_INCLUDES=-I$(BUILDTOP)/include/kerberosIV

COM_ERR_DEPS = $(BUILDTOP)/include/com_err.h

ARADD=rem
RANLIB=rem
ARCHIVE=rem

LIBEXT=lib
OBJEXT=obj
EXEEXT=.exe

Expand Down
4 changes: 2 additions & 2 deletions src/kadmin/kdbkeys/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ OBJS = kdbkeys.o

all:: $(PROG)

$(PROG): $(OBJS) $(DEPLIBS)
$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
$(PROG): $(OBJS)
$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)

install::
$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
Expand Down

0 comments on commit 780b34c

Please sign in to comment.