rxgk: Add NTMakefile to install headers 14/13814/4
authorAndrew Deason <adeason@sinenomine.net>
Mon, 26 Aug 2019 19:34:45 +0000 (14:34 -0500)
committerBenjamin Kaduk <kaduk@mit.edu>
Wed, 28 Aug 2019 06:50:58 +0000 (02:50 -0400)
Commit 83eec909 (Implement afsconf_GetRXGKKey) added a reference to
rx/rxgk_types.h inside cellconfig.p.h. Nothing ever added src/rxgk
WINNT makefiles, so that include file is never installed into
place, breaking the WINNT build when code tries to include
cellconfig.h.

To fix this and other code that needs rxgk header files, create an
NTMakefile for src/rxgk, which just exists to install headers into
place. Call it from the top-level NTMakefile right before copying in
the auth headers.

Change-Id: Id111479f55b4c330640e80d167a8af664fe3622e
Reviewed-on: https://gerrit.openafs.org/13814
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

NTMakefile
src/rxgk/NTMakefile [new file with mode: 0644]

index 4fae9e8..e3be8f9 100644 (file)
@@ -292,7 +292,14 @@ cm_headers: libacl_headers
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
-auth_headers: cm_headers
+rxgk_headers: cm_headers
+     @echo ***** $@
+       $(DOCD) $(SRC)\rxgk
+       $(CD) $(SRC)\rxgk
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
+auth_headers: rxgk_headers
      @echo ***** $@
        $(DOCD) $(SRC)\auth
        $(CD) $(SRC)\auth
diff --git a/src/rxgk/NTMakefile b/src/rxgk/NTMakefile
new file mode 100644 (file)
index 0000000..e421106
--- /dev/null
@@ -0,0 +1,29 @@
+# Copyright 2000, International Business Machines Corporation and others.
+# All Rights Reserved.
+#
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+
+RELDIR=rxgk
+!include ..\config\NTMakefile.$(SYS_NAME)
+
+INCFILEDIR = $(DESTDIR)\include\rx
+
+INCFILES  = \
+       $(INCFILEDIR)\rxgk_types.h \
+       $(INCFILEDIR)\rxgk_int.h
+
+$(INCFILEDIR)\rxgk_types.h: rxgk_types.h
+       $(COPY) rxgk_types.h $@
+
+$(INCFILEDIR)\rxgk_int.h: rxgk_int.h
+       $(COPY) rxgk_int.h $@
+
+rxgk_int.h: rxgk_int.xg
+       $(RXGEN) -b -A -x -h -o $@ rxgk_int.xg
+
+install_headers:  $(INCFILES)
+
+clean::
+       $(DEL) rxgk_int.h