diff options
author | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
commit | ee7c901f80fc9057ed6bd1f91d04859d764fb046 (patch) | |
tree | d4e0e5e1bc234fe674572b799c5750175af5180c /src/windows | |
parent | d4afef7bcb12da240ea501aa3d274092569b11dc (diff) | |
download | krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.gz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.xz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.zip |
Consolidate Makefile variables now that we have only a single global
configure script:
$(SRCTOP) --> $(top_srcdir)
$(srcdir)/$(thisconfigdir) --> $(top_srcdir)
$(thisconfigdir) --> $(BUILDTOP)
$(myfulldir) --> $(mydir)
ticket: 6583
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23308 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
-rw-r--r-- | src/windows/kfwlogon/Makefile.in | 4 | ||||
-rw-r--r-- | src/windows/ms2mit/Makefile.in | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index 47b48109fa..f6e523d22f 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -1,8 +1,6 @@ # Makefile for the KFW Network Provider # -thisconfigdir=./.. -myfulldir=windows/nplogon mydir=. BUILDTOP=$(REL)..$(S).. DEFINES = @@ -15,7 +13,7 @@ PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib VERSIONRC = $(BUILDTOP)\windows\version.rc -RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY +RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY KFWLOGON=$(OUTPRE)kfwlogon.dll KFWCPCC=$(OUTPRE)kfwcpcc.exe diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in index 0bb4d8d702..59d5e7f21b 100644 --- a/src/windows/ms2mit/Makefile.in +++ b/src/windows/ms2mit/Makefile.in @@ -2,15 +2,13 @@ # Works for k5 release only. # -thisconfigdir=./.. -myfulldir=windows/ms2mit mydir=. BUILDTOP=$(REL)..$(S).. DEFINES = PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) VERSIONRC = $(BUILDTOP)\windows\version.rc -RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY +RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY MS2MIT=$(OUTPRE)ms2mit.exe MIT2MS=$(OUTPRE)mit2ms.exe |