From: Theodore Tso <tytso@mit.edu>
Date: Sun, 14 Mar 1999 05:24:27 +0000 (+0000)
Subject: Changes to allow building the profile routines as their own separate DLL
X-Git-Tag: krb5-1.1-beta1~284
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18ea77b85a3de55a6ac78b1846e65178d3663824;p=krb5.git

Changes to allow building the profile routines as their own separate DLL

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11282 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 234512a33..d0e25ea34 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -30,6 +30,7 @@ clean-windows::
 # Windows stuff to make krb5 and gssapi DLLs.
 
 CLIBS = $(BUILDTOP)\util\et\comerr.lib
+PLIBS = $(BUILDTOP)\util\profile\profile.lib
 KLIBS = krb5\krb5.lib crypto\crypto.lib \
 	$(BUILDTOP)\util\profile\profile.lib des425\des425.lib
 GLIBS = gssapi\gssapi.lib
@@ -45,6 +46,8 @@ K4LIBS = krb4\krb4.lib
 
 ##WIN16##CDEF = comerr16.def
 ##WIN32##CDEF = comerr32.def
+##WIN16##PDEF = xpprof16.def
+##WIN32##PDEF = xpprof32.def
 ##WIN16##KDEF = krb5_16.def
 ##WIN32##KDEF = krb5_32.def
 ##WIN16##KRB5RC = krb5.rc
@@ -75,10 +78,20 @@ $(CLIB): $(CLIBS) $(WLIB) $(CDEF) no_glue.obj
 ##WIN32##	link $(WINDLLFLAGS) /def:$(CDEF) /out:$*.dll \
 ##WIN32##	   no_glue.obj version.res $(CLIBS) $(WINLIBS)
 
-$(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE_LIB)
+$(PLIB): $(PLIBS) $(WLIB) $(PDEF) no_glue.obj
+##WIN16##	link /co /seg:400 /noe /nod /nol \
+##WIN16##	   no_glue, $*.dll, $*.map, $(PLIBS) $(WINLIBS), $(PDEF)
+##WIN16##	copy $(VERSIONRC) version.rc
+##WIN16##	rc /nologo /p /k $(CPPFLAGS) -DPROF_LIB -D_MSDOS_ -DRES_ONLY version.rc $*.dll
+##WIN16##	implib /nologo $@ $*.dll
+##WIN32##	rc  $(CPPFLAGS) -DPROF_LIB -D_WIN32 -D_MSDOS_ -DRES_ONLY -fo version.res $(VERSIONRC)
+##WIN32##	link $(WINDLLFLAGS) /def:$(PDEF) /out:$*.dll \
+##WIN32##	   no_glue.obj version.res $(PLIBS) $(WINLIBS)
+
+$(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE_LIB)
 ##WIN16##	link /co /seg:400 /noe /nod /nol \
 ##WIN16##	   k5_glue, $*.dll, $*.map, \
-##WIN16##	   $(MITLIBS) $(KLIBS) $(CLIB) $(WINLIBS), $(KDEF)
+##WIN16##	   $(MITLIBS) $(KLIBS) $(CLIB) $(PLIB) $(WINLIBS), $(KDEF)
 ##WIN16##	rc /nologo /p /k $(CPPFLAGS) -DKRB5_LIB -D_MSDOS -DRES_ONLY \
 ##WIN16##	   $(KRB5RC) $*.dll
 ##WIN16##	implib /nologo $@ $*.dll
@@ -86,7 +99,7 @@ $(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE_LIB)
 ##WIN32##	   -fo version.res $(VERSIONRC)
 ##WIN32##	link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \
 ##WIN32##	   k5_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) \
-##WIN32##          $(CCACHE_LIB) $(CLIB) \
+##WIN32##          $(CCACHE_LIB) $(CLIB) $(PLIB) \
 ##WIN32##	   $(WINLIBS) advapi32.lib gdi32.lib
 
 $(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) gss_glue.obj
@@ -176,6 +189,7 @@ comerr.lib: $(CLIB)
 krb4.lib:   $(K4LIB)
 krb5.lib:   $(KLIB)
 gssapi.lib: $(GLIB)
+profile.lib: $(PLIB)
 
 all-windows:: 
 	@echo Making in lib\crypto
@@ -197,7 +211,7 @@ all-windows::
 	cd ..
 
 all-windows:: lib-windows
-lib-windows:: krb5.lib gssapi.lib krb4.lib
+lib-windows:: krb5.lib gssapi.lib krb4.lib 
 
 clean-windows::
 	@echo Making clean in lib\crypto
diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 8b055be82..8ac1d43a7 100644
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -191,7 +191,7 @@ EXPORTS
 ;	krb5_free_adm_data
 ;	krb5_read_adm_reply
 ;	krb5_send_adm_cmd
-;
+
 	krb5_change_password
 ;Temporary exports (DO NOT USE)
 	decode_krb5_ticket
@@ -203,7 +203,6 @@ EXPORTS
 	des_string_to_key
 ;	des_set_random_generator_seed
 	des_init_random_number_generator
-	profile_get_values
 	krb5_random_confounder
 	krb5_size_opaque
 	krb5_internalize_opaque
diff --git a/src/lib/xpprof16.def b/src/lib/xpprof16.def
new file mode 100644
index 000000000..e356718e9
--- /dev/null
+++ b/src/lib/xpprof16.def
@@ -0,0 +1,33 @@
+;----------------------------------------------------
+;   XPPROF16.DEF - XPPROF16.DLL 
+;----------------------------------------------------
+
+LIBRARY		XPPROF16.DLL
+DESCRIPTION	'Cross Platform Profile DLL'
+EXETYPE		WINDOWS
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
+
+EXPORTS
+	WEP					@1001 RESIDENTNAME
+	LibMain					@1002
+;
+	profile_init
+	profile_init_path
+	profile_flush
+	profile_release
+	profile_get_values
+	profile_free_list
+	profile_get_string
+	profile_get_integer
+	profile_get_relation_names
+	profile_get_subsection_names
+	profile_iterator_create
+	profile_iterator_free
+	profile_iterator
+	profile_release_string
+	profile_update_relation
+	profile_clear_relation
+	profile_rename_section
+	profile_add_relation
diff --git a/src/lib/xpprof32.def b/src/lib/xpprof32.def
new file mode 100644
index 000000000..c3d2d530b
--- /dev/null
+++ b/src/lib/xpprof32.def
@@ -0,0 +1,29 @@
+;----------------------------------------------------
+;   XPPROF32.DEF - XPPROF32.DLL 
+;----------------------------------------------------
+
+;LIBRARY		XPPROF32.DLL
+DESCRIPTION	'Cross Platform Profile DLL'
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
+
+EXPORTS
+	profile_init
+	profile_init_path
+	profile_flush
+	profile_release
+	profile_get_values
+	profile_free_list
+	profile_get_string
+	profile_get_integer
+	profile_get_relation_names
+	profile_get_subsection_names
+	profile_iterator_create
+	profile_iterator_free
+	profile_iterator
+	profile_release_string
+	profile_update_relation
+	profile_clear_relation
+	profile_rename_section
+	profile_add_relation