From: Sam Hartman Date: Wed, 28 Sep 2011 21:02:41 +0000 (+0000) Subject: Moved Windows specific include files to src/windows/include X-Git-Tag: krb5-1.10-alpha1~96 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7679d12a91940657639c5550ba5e6c0fc65ba8af;p=krb5.git Moved Windows specific include files to src/windows/include Updated Windows specific Makefiles to search for header files in src/windows/include Signed-off-by: Alexey Melnikov git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25279 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/config/win-pre.in b/src/config/win-pre.in index bcef2f4b8..a79133d24 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -91,7 +91,7 @@ top_srcdir = $(srcdir)\$(BUILDTOP) KRB5_USE_DNS=1 KRB5_USE_DNS_KDC=1 DNS_LIB=$(BUILDTOP)\util\wshelper\$(OUTPRE)$(DLIB).lib -DNS_INC=$(BUILDTOP)\util\wshelper +DNS_INC=$(BUILDTOP)\windows\include !if defined(KRB5_USE_DNS) || defined(KRB5_USE_DNS_KDC) || defined(KRB5_USE_DNS_REALMS) !if defined(KRB5_NO_WSHELPER) diff --git a/src/util/wshelper/Makefile.in b/src/util/wshelper/Makefile.in index 3da2b5994..5fa5cd469 100644 --- a/src/util/wshelper/Makefile.in +++ b/src/util/wshelper/Makefile.in @@ -24,7 +24,7 @@ OBJS= $(OUTPRE)dllmain.$(OBJEXT) \ RESFILE = $(OUTPRE)resource.res XOBJS = $(RESFILE) -RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DWSHELPER_LIB +RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include -I$(BUILDTOP) -DWSHELPER_LIB ###From another project inside K 1.9: ###VERSIONRC = $(BUILDTOP)\windows\version.rc @@ -33,7 +33,7 @@ RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DWSHELPER_LIB # Set NODEBUG if building release instead of debug -LOCALINCLUDES = -I$(BUILDTOP)\include +LOCALINCLUDES = -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include WINLIBS = advapi32.lib user32.lib ws2_32.lib dnsapi.lib diff --git a/src/include/arpa/nameser.h b/src/windows/include/arpa/nameser.h similarity index 100% rename from src/include/arpa/nameser.h rename to src/windows/include/arpa/nameser.h diff --git a/src/include/hesiod.h b/src/windows/include/hesiod.h similarity index 100% rename from src/include/hesiod.h rename to src/windows/include/hesiod.h diff --git a/src/windows/leashdll/include/leasherr.h b/src/windows/include/leasherr.h similarity index 100% rename from src/windows/leashdll/include/leasherr.h rename to src/windows/include/leasherr.h diff --git a/src/windows/leashdll/include/leashinfo.h b/src/windows/include/leashinfo.h similarity index 100% rename from src/windows/leashdll/include/leashinfo.h rename to src/windows/include/leashinfo.h diff --git a/src/windows/leashdll/include/leashwin.h b/src/windows/include/leashwin.h similarity index 100% rename from src/windows/leashdll/include/leashwin.h rename to src/windows/include/leashwin.h diff --git a/src/include/loadfuncs-com_err.h b/src/windows/include/loadfuncs-com_err.h similarity index 100% rename from src/include/loadfuncs-com_err.h rename to src/windows/include/loadfuncs-com_err.h diff --git a/src/include/loadfuncs-krb5.h b/src/windows/include/loadfuncs-krb5.h similarity index 100% rename from src/include/loadfuncs-krb5.h rename to src/windows/include/loadfuncs-krb5.h diff --git a/src/include/loadfuncs-leash.h b/src/windows/include/loadfuncs-leash.h similarity index 100% rename from src/include/loadfuncs-leash.h rename to src/windows/include/loadfuncs-leash.h diff --git a/src/include/loadfuncs-lsa.h b/src/windows/include/loadfuncs-lsa.h similarity index 100% rename from src/include/loadfuncs-lsa.h rename to src/windows/include/loadfuncs-lsa.h diff --git a/src/include/loadfuncs-profile.h b/src/windows/include/loadfuncs-profile.h similarity index 100% rename from src/include/loadfuncs-profile.h rename to src/windows/include/loadfuncs-profile.h diff --git a/src/include/loadfuncs.h b/src/windows/include/loadfuncs.h similarity index 100% rename from src/include/loadfuncs.h rename to src/windows/include/loadfuncs.h diff --git a/src/include/mitwhich.h b/src/windows/include/mitwhich.h similarity index 100% rename from src/include/mitwhich.h rename to src/windows/include/mitwhich.h diff --git a/src/include/resolv.h b/src/windows/include/resolv.h similarity index 100% rename from src/include/resolv.h rename to src/windows/include/resolv.h diff --git a/src/include/wshelper.h b/src/windows/include/wshelper.h similarity index 100% rename from src/include/wshelper.h rename to src/windows/include/wshelper.h diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index 3c8cb0b7a..1da305863 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -4,7 +4,7 @@ mydir=. BUILDTOP=$(REL)..$(S).. DEFINES = -DNO_KRB4 -LOCALINCLUDES = -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\leashdll\include +LOCALINCLUDES = -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in index 418a0a0f8..717c36ca5 100644 --- a/src/windows/leashdll/Makefile.in +++ b/src/windows/leashdll/Makefile.in @@ -47,7 +47,7 @@ RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DLEASHDLL_LIB # Set NODEBUG if building release instead of debug -LOCALINCLUDES = -I$(BUILDTOP)\include -I.\include -I.\include\krb4 $(AFS_INCLUDES) +LOCALINCLUDES = -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include -I.\include -I.\include\krb4 $(AFS_INCLUDES) WINLIBS = kernel32.lib advapi32.lib user32.lib gdi32.lib Version.lib \ ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\$(CCLIB).lib $(AFS_LIBS) diff --git a/src/windows/lib/Makefile.in b/src/windows/lib/Makefile.in index 119db8902..c5fff76a1 100644 --- a/src/windows/lib/Makefile.in +++ b/src/windows/lib/Makefile.in @@ -1,5 +1,7 @@ BUILDTOP = ..\.. +LOCALINCLUDES = -I$(BUILDTOP)\windows\include + lib-windows: $(OUTPRE)libwin.lib SRCS= vardlg.c gic.c registry.c loadfuncs.c