Changeset 6

Timestamp:

May 13, 2016, 11:56:08 PM (9 years ago)

Author:

Paul Smedley

Message:

Build fixes

Location:

heimdal/trunk

Files:

• kdc/Makefile.in (modified) (3 diffs)
• lib/gssapi/mech/utils.h (modified) (1 diff)

heimdal/trunk/kdc/Makefile.in

@@ -22 +22 @@
 # $Id$
 
+OS2_LA_NAME=kdc
+OS2_DLL_NAME=kdc
+OS2_DLL_OBJ=$(libkdc_la_OBJECTS:%.lo=%.o) 
+OS2_DLL_LIBS=$(LIBS) ../lib/krb5/.libs/krb5.a ../lib/com_err/.libs/com_err.a ../lib/asn1/.libs/asn1.a ../lib/hx509/.libs/hx509.a ../lib/hdb/.libs/hdb.a ../lib/hcrypto/.libs/hcrypto.a ../lib/roken/.libs/roken.a ../lib/ntlm/.libs/heimntlm.a
 
 
@@ -560 +564 @@
         NTMakefile $(man_MANS) version-script.map
 
-all: all-am
+all: all-am $(OS2_DLL_NAME).dll
 
 .SUFFIXES:
@@ -1400 +1404 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
+
+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
+        cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
+        echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def
+        echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
+        echo "EXPORTS" >> $(OS2_DLL_NAME).def
+        emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
+        gcc -g -Zbin-files -Zhigh-mem -Zomf -Zmap -static-libgcc -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 
+        emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
+        emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def

heimdal/trunk/lib/gssapi/mech/utils.h

@@ -28 +28 @@
  */
 
+#ifdef __OS2__
+#include "gssapi/gssapi.h"
+#endif
+
 OM_uint32 _gss_free_oid(OM_uint32 *, gss_OID);
 OM_uint32 _gss_copy_oid(OM_uint32 *, const gss_OID, gss_OID);