Changeset 196

Timestamp:

Jun 2, 2006, 8:00:46 AM (18 years ago)

Author:

garonne

Message:

add the STRUCTURED_OUTPUT support on linux +mac

Location:

CMT/HEAD/mgr/fragments

Files:

• c_library (modified) (1 diff)
• cleanup_library (modified) (1 diff)
• cpp (modified) (1 diff)
• cpp_library (modified) (1 diff)
• fortran_library (modified) (1 diff)
• lex_library (modified) (2 diffs)
• make_header (modified) (1 diff)
• nmake/application (modified) (1 diff)
• yacc_library (modified) (2 diffs)

CMT/HEAD/mgr/fragments/c_library

@@ -1 +1 @@
 #-- start of c_library ------
 
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(c_echo) $@
-        $(c_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
+        $(c_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
 
 #-- end of c_library ------

CMT/HEAD/mgr/fragments/cleanup_library

@@ -1 +1 @@
 #-- start of cleanup_library -------------
         $(cleanup_echo) library
-        -$(cleanup_silent) cd $(bin); /bin/rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).s? ${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp
+        -$(cleanup_silent) cd $(bin); /bin/rm -f $(binobj)$(library_prefix)${CONSTITUENT}$(library_suffix).a $$(binobj)(library_prefix)${CONSTITUENT}$(library_suffix).s? (binobj)${CONSTITUENT}.stamp (binobj)${CONSTITUENT}.shstamp
 #-- end of cleanup_library ---------------
 

CMT/HEAD/mgr/fragments/cpp

@@ -1 +1 @@
 #-- start of cpp ------
 
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(cpp_echo) $@
-        $(cpp_silent) cd $(bin); $(cppcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
+        $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
 
 #-- end of cpp ------

CMT/HEAD/mgr/fragments/cpp_library

@@ -1 +1 @@
 #-- start of cpp_library -----------------
-
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+#
+$(bin)$(binobj)/${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(cpp_echo) $@
-        $(cpp_silent) cd $(bin); $(cppcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
+        $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
 
 #-- end of cpp_library ------------------

CMT/HEAD/mgr/fragments/fortran_library

@@ -1 +1 @@
 #-- start of fortran_library ------
  
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(fortran_echo) $@
-        $(fortran_silent)cd $(bin); $(fcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
+        $(fortran_silent)cd $(bin); $(fcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
 
 #-- end of fortran_library ------

CMT/HEAD/mgr/fragments/lex_library

@@ -1 +1 @@
 #-- start of lex_library ------
 
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(lex_echo) $@
         $(lex_silent) cd $(src); \
@@ -10 +10 @@
               -e 's/ = {stdout}//' lex.yy.c > lex.yy.c.tmp; \
           $(cmtexe) check_files lex.yy.c.tmp ${NAME}.c; /bin/rm -f lex.yy.c
-        $(lex_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} $(src)${NAME}.c
+        $(lex_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} $(src)${NAME}.c
 
 #-- end of lex_library ------

CMT/HEAD/mgr/fragments/make_header

@@ -99 +99 @@
         @echo '${CONSTITUENT}'
 
+binobj = 
+ifdef STRUCTURED_OUTPUT
+binobj = ${CONSTITUENT}/
+${CONSTITUENT}::
+        @if test ! -d $(bin)$(binobj) ; then $(mkdir) -p $(bin)$(binobj) ; fi
+        @echo "STRUCTURED_OUTPUT="$(bin)$(binobj)
+endif
+
 #-- end of make_header ------------------

CMT/HEAD/mgr/fragments/nmake/application

@@ -6 +6 @@
 $(use_linkopts)
 $(${CONSTITUENT}linkopts)
-<<
+
 
 install_dir = $(CMTINSTALLAREA)\$(tag)\bin

CMT/HEAD/mgr/fragments/yacc_library

@@ -1 +1 @@
 #-- start of yacc_library ------
 
-$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
         $(yacc_echo) $@
         $(yacc_silent) cd $(src); \
@@ -9 +9 @@
           sed -e 's/yy/${NAME}YY/g' -e 's/ParseYY/YY/g' y.tab.h > y.tab.h.tmp; \
           $(cmtexe) check_files y.tab.h.tmp ${NAME}.h; /bin/rm -f y.tab.[ch]
-        $(yacc_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} $(src)${NAME}.c
+        $(yacc_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} $(src)${NAME}.c
 
 #-- end of yacc_library ------