[m-dev.] why is mercury_mcpp.h in DOS format?

Tyson Dowd trd at cs.mu.OZ.AU
Mon Jan 15 12:58:06 AEDT 2001


On 15-Jan-2001, Zoltan Somogyi <zs at cs.mu.OZ.AU> wrote:
> On 15-Jan-2001, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> > Well, it needs to be omitted from the HDR_CHEC_OBJS regardless of
> > whether it gets renamed.
> 
> Yes, but if we restricted HDR to contain only C header files, this would happen
> automatically, since HDR_CHECK_OBJS is computed from HDR.

I only put it in HDR to get it installed.  I can do this a different
way and we can assume that HDR only contains C code.


===================================================================


Estimated hours taken: 0.2

runtime/Mmakefile:
	Move the MC++ header file into a different category of header
	file, since this was causing problems with some automatic checks
	that assume all files in $(HDRS) are C.


Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.66
diff -u -r1.66 Mmakefile
--- Mmakefile	2001/01/12 03:50:16	1.66
+++ Mmakefile	2001/01/15 01:56:58
@@ -28,6 +28,7 @@
 
 # All the headers in $(HDRS) should be syntactically well-formed
 # header files, unlike the headers in $(BODY_HDRS).
+# All the headers in $(HDRS) must also be in C (not C++).
 
 #		  keep this list in alphabetical order, please
 HDRS		=	\
@@ -59,7 +60,6 @@
 			mercury_label.h		\
 			mercury_layout_util.h	\
 			mercury_library_types.h	\
-			mercury_mcpp.h		\
 			mercury_memory.h	\
 			mercury_memory_zones.h	\
 			mercury_memory_handlers.h	\
@@ -110,7 +110,10 @@
 			machdeps/pa_regs.h	\
 			machdeps/rs6000_regs.h
 
+# MCPP_HDRS are header files in Microsoft's Managed extensions for C++
 
+MCPP_HDRS	=	mercury_mcpp.h		
+
 #		  keep this list in alphabetical order, please
 CFILES		= 	\
 			mercury.c		\
@@ -363,8 +366,10 @@
 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
 
 .PHONY: install_headers
-install_headers: $(HDRS) $(BODY_HDRS) $(MACHHDRS) $(LIB_GLOBALS_H) install_dirs
+install_headers: $(HDRS) $(BODY_HDRS) $(MACHHDRS) $(LIB_GLOBALS_H) \
+		$(MCPP_HDRS) install_dirs
 	cp `vpath_find $(HDRS) $(BODY_HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
+	cp `vpath_find $(MCPP_HDRS)` $(INSTALL_INC_DIR)
 	-chmod u+w $(INSTALL_INC_DIR)/mercury_conf.h
 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
 


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list