FreeCalypso > hg > fc-selenite

changeset 22:0a1a78944683

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components: first automated conversion pass
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 15 Jul 2018 22:53:50 +0000
parents b7059379dd87
children 1c5f82f16701
files components/abb components/aci components/aci_dti_mng components/aciext components/alr components/atiext components/audio components/audio_bgd components/bootloader components/buzzer components/cc components/ccd_na7_db components/ccddata components/cci components/cci_ir components/cl components/comlib components/config_gprs_fl components/config_gprs_ir components/config_gsm_fl components/config_gsm_ir components/cst components/dar components/dar_gbl_var components/dl components/drivers_flash components/dti components/etm components/fad components/fchg components/ffs components/ffs_drv components/ffs_pcm components/frame_na7_db_fl components/frame_na7_db_ir components/gdi components/gmm components/grlc components/grlc_ir components/grr components/kpd components/l1_custom_ext components/l1_custom_int components/l1_ext components/l1_int components/l1_pei components/l2r components/llc components/lls components/main components/misc_na7_db_fl components/misc_na7_db_ir components/mm components/osx_na7_db components/power components/ppp components/ppp_ir components/ra components/riviera_core_flash components/riviera_cust_flash components/rlp components/rr components/rtc_drv components/sim_b_lib components/sim_drv components/sm components/sms components/sndcp components/spi_drv components/ss components/t30 components/tif_na7_db_fl components/tif_na7_db_ir components/tpudrv components/uart_b_lib components/uart_drv components/upm scripts/convert-from-magnetite.ex
diffstat 78 files changed, 1296 insertions(+), 1286 deletions(-) [+]
line wrap: on
line diff
--- a/components/abb	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/abb	Sun Jul 15 22:53:50 2018 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -51,4 +51,4 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/abb
 
-cfile_plain $SRCDIR/board/abb_inth.c
+c_file $SRCDIR/board/abb_inth.c
--- a/components/aci	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/aci	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version aci
-cfile_plain aci_version.c
+c_file aci_version.c
 
 # Defines
 
@@ -88,10 +88,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 if [ "$MMI" = 2 ]
 then
@@ -103,7 +103,7 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_ext"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -132,177 +132,177 @@
 SRCDIR=$SRC/g23m-aci/aci
 
 # ATI stuff
-cfile_str2ind $SRCDIR/ati_sat.c
-cfile_str2ind $SRCDIR/ati_src_sat.c
-cfile_str2ind $SRCDIR/ati_pdu.c
-cfile_str2ind $SRCDIR/ati_bas.c
-cfile_str2ind $SRCDIR/ati_cc.c
-cfile_str2ind $SRCDIR/ati_cmd.c
-cfile_str2ind $SRCDIR/ati_csc.c
-cfile_str2ind $SRCDIR/ati_err.c
+c_file $SRCDIR/ati_sat.c
+c_file $SRCDIR/ati_src_sat.c
+c_file $SRCDIR/ati_pdu.c
+c_file $SRCDIR/ati_bas.c
+c_file $SRCDIR/ati_cc.c
+c_file $SRCDIR/ati_cmd.c
+c_file $SRCDIR/ati_csc.c
+c_file $SRCDIR/ati_err.c
 
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/ati_fd.c
+	c_file $SRCDIR/ati_fd.c
 fi
 
-cfile_str2ind $SRCDIR/ati_io.c
-cfile_str2ind $SRCDIR/ati_mm.c
-cfile_str2ind $SRCDIR/ati_phb.c
-cfile_str2ind $SRCDIR/ati_prs.c
-cfile_str2ind $SRCDIR/ati_ret.c
-cfile_str2ind $SRCDIR/ati_sim.c
-cfile_str2ind $SRCDIR/ati_sms.c
-cfile_str2ind $SRCDIR/ati_ss.c
+c_file $SRCDIR/ati_io.c
+c_file $SRCDIR/ati_mm.c
+c_file $SRCDIR/ati_phb.c
+c_file $SRCDIR/ati_prs.c
+c_file $SRCDIR/ati_ret.c
+c_file $SRCDIR/ati_sim.c
+c_file $SRCDIR/ati_sms.c
+c_file $SRCDIR/ati_ss.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/ati_gprs.c
+	c_file $SRCDIR/ati_gprs.c
 fi
 
-cfile_str2ind $SRCDIR/ati_mmi.c
-cfile_str2ind $SRCDIR/ati_em.c
-cfile_str2ind $SRCDIR/ati_em_ret.c
-cfile_str2ind $SRCDIR/ati_cphs.c
-cfile_str2ind $SRCDIR/ati_dti.c
+c_file $SRCDIR/ati_mmi.c
+c_file $SRCDIR/ati_em.c
+c_file $SRCDIR/ati_em_ret.c
+c_file $SRCDIR/ati_cphs.c
+c_file $SRCDIR/ati_dti.c
 
-cfile_str2ind $SRCDIR/ati_src_rvt.c
-cfile_str2ind $SRCDIR/ati_omcompat.c
-cfile_str2ind $SRCDIR/ati_audio.c
-cfile_str2ind $SRCDIR/ati_fchg.c
+c_file $SRCDIR/ati_src_rvt.c
+c_file $SRCDIR/ati_omcompat.c
+c_file $SRCDIR/ati_audio.c
+c_file $SRCDIR/ati_fchg.c
 
 # ACI stuff
-cfile_str2ind $SRCDIR/aci_aci.c
-cfile_str2ind $SRCDIR/aci_mem.c
-cfile_str2ind $SRCDIR/aci_csf.c
-cfile_str2ind $SRCDIR/aci_pei.c
-cfile_str2ind $SRCDIR/aci_tim.c
-cfile_str2ind $SRCDIR/aci_util.c
-cfile_str2ind $SRCDIR/aci_lst.c
-cfile_str2ind $SRCDIR/dti_cntrl_mng.c
-cfile_str2ind $SRCDIR/phb.c
-cfile_str2ind $SRCDIR/aoc.c
-cfile_str2ind $SRCDIR/aci_mfw.c
-cfile_str2ind $SRCDIR/aci_slock.c
-cfile_str2ind $SRCDIR/aci_em.c
+c_file $SRCDIR/aci_aci.c
+c_file $SRCDIR/aci_mem.c
+c_file $SRCDIR/aci_csf.c
+c_file $SRCDIR/aci_pei.c
+c_file $SRCDIR/aci_tim.c
+c_file $SRCDIR/aci_util.c
+c_file $SRCDIR/aci_lst.c
+c_file $SRCDIR/dti_cntrl_mng.c
+c_file $SRCDIR/phb.c
+c_file $SRCDIR/aoc.c
+c_file $SRCDIR/aci_mfw.c
+c_file $SRCDIR/aci_slock.c
+c_file $SRCDIR/aci_em.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/gaci_srcc.c
-	cfile_str2ind $SRCDIR/gaci.c
-	cfile_str2ind $SRCDIR/gaci_ret.c
+	c_file $SRCDIR/gaci_srcc.c
+	c_file $SRCDIR/gaci.c
+	c_file $SRCDIR/gaci_ret.c
 fi
 
-cfile_str2ind $SRCDIR/hl_audio_drv.c
+c_file $SRCDIR/hl_audio_drv.c
 
 # ATISRC stuff
-cfile_str2ind $SRCDIR/ati_src_uart.c
-cfile_str2ind $SRCDIR/ati_src_uart_io.c
+c_file $SRCDIR/ati_src_uart.c
+c_file $SRCDIR/ati_src_uart_io.c
 
 # CMH stuff (part 1)
-cfile_str2ind $SRCDIR/cmh_sats.c
-cfile_str2ind $SRCDIR/cmh_satr.c
-cfile_str2ind $SRCDIR/cmh_satq.c
+c_file $SRCDIR/cmh_sats.c
+c_file $SRCDIR/cmh_satr.c
+c_file $SRCDIR/cmh_satq.c
 
 # CMH stuff (part 2)
 if [ "$SRVC" = 0 ]
 then
-	cfile_str2ind $SRCDIR/cmh_ccf.c
-	cfile_str2ind $SRCDIR/cmh_ccq.c
-	cfile_str2ind $SRCDIR/cmh_ccr.c
-	cfile_str2ind $SRCDIR/cmh_ccs.c
-	cfile_str2ind $SRCDIR/cmh_dmy.c
-	cfile_str2ind $SRCDIR/cmh_f.c
-	cfile_str2ind $SRCDIR/cmh_mmf.c
-	cfile_str2ind $SRCDIR/cmh_mmir.c
-	cfile_str2ind $SRCDIR/cmh_mmis.c
-	cfile_str2ind $SRCDIR/cmh_mmit.c
-	cfile_str2ind $SRCDIR/cmh_mmiq.c
-	cfile_str2ind $SRCDIR/cmh_mmq.c
-	cfile_str2ind $SRCDIR/cmh_mmr.c
-	cfile_str2ind $SRCDIR/cmh_mms.c
-	cfile_str2ind $SRCDIR/cmh_mmt.c
-	cfile_str2ind $SRCDIR/cmh_phbf.c
-	cfile_str2ind $SRCDIR/cmh_ssq.c
-	cfile_str2ind $SRCDIR/cmh_ssr.c
-	cfile_str2ind $SRCDIR/cmh_sss.c
-	cfile_str2ind $SRCDIR/cmh_phbq.c
-	cfile_str2ind $SRCDIR/cmh_phbs.c
-	cfile_str2ind $SRCDIR/cmh_phbt.c
-	cfile_str2ind $SRCDIR/cmh_phbr.c
-	cfile_str2ind $SRCDIR/cmh_simf.c
-	cfile_str2ind $SRCDIR/cmh_simq.c
-	cfile_str2ind $SRCDIR/cmh_simr.c
-	cfile_str2ind $SRCDIR/cmh_sims.c
-	cfile_str2ind $SRCDIR/cmh_smsf.c
-	cfile_str2ind $SRCDIR/cmh_smsq.c
-	cfile_str2ind $SRCDIR/cmh_smsr.c
-	cfile_str2ind $SRCDIR/cmh_smss.c
-	cfile_str2ind $SRCDIR/cmh_ssf.c
-	cfile_str2ind $SRCDIR/cmh_tsts.c
-	cfile_str2ind $SRCDIR/cmh_uartf.c
-    	cfile_str2ind $SRCDIR/cmh_uartr.c
-	cfile_str2ind $SRCDIR/cmh_uarts.c
+	c_file $SRCDIR/cmh_ccf.c
+	c_file $SRCDIR/cmh_ccq.c
+	c_file $SRCDIR/cmh_ccr.c
+	c_file $SRCDIR/cmh_ccs.c
+	c_file $SRCDIR/cmh_dmy.c
+	c_file $SRCDIR/cmh_f.c
+	c_file $SRCDIR/cmh_mmf.c
+	c_file $SRCDIR/cmh_mmir.c
+	c_file $SRCDIR/cmh_mmis.c
+	c_file $SRCDIR/cmh_mmit.c
+	c_file $SRCDIR/cmh_mmiq.c
+	c_file $SRCDIR/cmh_mmq.c
+	c_file $SRCDIR/cmh_mmr.c
+	c_file $SRCDIR/cmh_mms.c
+	c_file $SRCDIR/cmh_mmt.c
+	c_file $SRCDIR/cmh_phbf.c
+	c_file $SRCDIR/cmh_ssq.c
+	c_file $SRCDIR/cmh_ssr.c
+	c_file $SRCDIR/cmh_sss.c
+	c_file $SRCDIR/cmh_phbq.c
+	c_file $SRCDIR/cmh_phbs.c
+	c_file $SRCDIR/cmh_phbt.c
+	c_file $SRCDIR/cmh_phbr.c
+	c_file $SRCDIR/cmh_simf.c
+	c_file $SRCDIR/cmh_simq.c
+	c_file $SRCDIR/cmh_simr.c
+	c_file $SRCDIR/cmh_sims.c
+	c_file $SRCDIR/cmh_smsf.c
+	c_file $SRCDIR/cmh_smsq.c
+	c_file $SRCDIR/cmh_smsr.c
+	c_file $SRCDIR/cmh_smss.c
+	c_file $SRCDIR/cmh_ssf.c
+	c_file $SRCDIR/cmh_tsts.c
+	c_file $SRCDIR/cmh_uartf.c
+    	c_file $SRCDIR/cmh_uartr.c
+	c_file $SRCDIR/cmh_uarts.c
 fi
 
-cfile_str2ind $SRCDIR/cmh_emq.c
-cfile_str2ind $SRCDIR/cmh_emr.c
+c_file $SRCDIR/cmh_emq.c
+c_file $SRCDIR/cmh_emr.c
 
 # CMH stuff (part 3)
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/cmh_ccf.c
-	cfile_str2ind $SRCDIR/cmh_ccq.c
-	cfile_str2ind $SRCDIR/cmh_ccr.c
-	cfile_str2ind $SRCDIR/cmh_ccs.c
-	cfile_str2ind $SRCDIR/cmh_dmy.c
-	cfile_str2ind $SRCDIR/cmh_f.c
-	cfile_str2ind $SRCDIR/cmh_l2rf.c
-	cfile_str2ind $SRCDIR/cmh_l2rq.c
-	cfile_str2ind $SRCDIR/cmh_l2rr.c
-	cfile_str2ind $SRCDIR/cmh_l2rs.c
-	cfile_str2ind $SRCDIR/cmh_mmf.c
-	cfile_str2ind $SRCDIR/cmh_mmir.c
-	cfile_str2ind $SRCDIR/cmh_mmis.c
-	cfile_str2ind $SRCDIR/cmh_mmit.c
-	cfile_str2ind $SRCDIR/cmh_mmiq.c
-	cfile_str2ind $SRCDIR/cmh_mmq.c
-	cfile_str2ind $SRCDIR/cmh_mmr.c
-	cfile_str2ind $SRCDIR/cmh_mms.c
-	cfile_str2ind $SRCDIR/cmh_mmt.c
-	cfile_str2ind $SRCDIR/cmh_phbf.c
-	cfile_str2ind $SRCDIR/cmh_phbq.c
-	cfile_str2ind $SRCDIR/cmh_ssq.c
-	cfile_str2ind $SRCDIR/cmh_ssr.c
-	cfile_str2ind $SRCDIR/cmh_sss.c
-	cfile_str2ind $SRCDIR/cmh_phbs.c
-	cfile_str2ind $SRCDIR/cmh_phbt.c
-	cfile_str2ind $SRCDIR/cmh_phbr.c
-	cfile_str2ind $SRCDIR/cmh_raf.c
-	cfile_str2ind $SRCDIR/cmh_rar.c
-	cfile_str2ind $SRCDIR/cmh_ras.c
-	cfile_str2ind $SRCDIR/cmh_simf.c
-	cfile_str2ind $SRCDIR/cmh_simq.c
-	cfile_str2ind $SRCDIR/cmh_simr.c
-	cfile_str2ind $SRCDIR/cmh_sims.c
-	cfile_str2ind $SRCDIR/cmh_smsf.c
-	cfile_str2ind $SRCDIR/cmh_smsq.c
-	cfile_str2ind $SRCDIR/cmh_smsr.c
-	cfile_str2ind $SRCDIR/cmh_smss.c
-	cfile_str2ind $SRCDIR/cmh_ssf.c
+	c_file $SRCDIR/cmh_ccf.c
+	c_file $SRCDIR/cmh_ccq.c
+	c_file $SRCDIR/cmh_ccr.c
+	c_file $SRCDIR/cmh_ccs.c
+	c_file $SRCDIR/cmh_dmy.c
+	c_file $SRCDIR/cmh_f.c
+	c_file $SRCDIR/cmh_l2rf.c
+	c_file $SRCDIR/cmh_l2rq.c
+	c_file $SRCDIR/cmh_l2rr.c
+	c_file $SRCDIR/cmh_l2rs.c
+	c_file $SRCDIR/cmh_mmf.c
+	c_file $SRCDIR/cmh_mmir.c
+	c_file $SRCDIR/cmh_mmis.c
+	c_file $SRCDIR/cmh_mmit.c
+	c_file $SRCDIR/cmh_mmiq.c
+	c_file $SRCDIR/cmh_mmq.c
+	c_file $SRCDIR/cmh_mmr.c
+	c_file $SRCDIR/cmh_mms.c
+	c_file $SRCDIR/cmh_mmt.c
+	c_file $SRCDIR/cmh_phbf.c
+	c_file $SRCDIR/cmh_phbq.c
+	c_file $SRCDIR/cmh_ssq.c
+	c_file $SRCDIR/cmh_ssr.c
+	c_file $SRCDIR/cmh_sss.c
+	c_file $SRCDIR/cmh_phbs.c
+	c_file $SRCDIR/cmh_phbt.c
+	c_file $SRCDIR/cmh_phbr.c
+	c_file $SRCDIR/cmh_raf.c
+	c_file $SRCDIR/cmh_rar.c
+	c_file $SRCDIR/cmh_ras.c
+	c_file $SRCDIR/cmh_simf.c
+	c_file $SRCDIR/cmh_simq.c
+	c_file $SRCDIR/cmh_simr.c
+	c_file $SRCDIR/cmh_sims.c
+	c_file $SRCDIR/cmh_smsf.c
+	c_file $SRCDIR/cmh_smsq.c
+	c_file $SRCDIR/cmh_smsr.c
+	c_file $SRCDIR/cmh_smss.c
+	c_file $SRCDIR/cmh_ssf.c
 
 	if [ "$SRVC" = 1 ]
 	then
-		cfile_str2ind $SRCDIR/cmh_t30f.c
-		cfile_str2ind $SRCDIR/cmh_t30r.c
-		cfile_str2ind $SRCDIR/cmh_t30s.c
-		cfile_str2ind $SRCDIR/cmh_t30q.c
+		c_file $SRCDIR/cmh_t30f.c
+		c_file $SRCDIR/cmh_t30r.c
+		c_file $SRCDIR/cmh_t30s.c
+		c_file $SRCDIR/cmh_t30q.c
 	fi
 
-	cfile_str2ind $SRCDIR/cmh_tsts.c
-	cfile_str2ind $SRCDIR/cmh_uartf.c
-	cfile_str2ind $SRCDIR/cmh_uartr.c
-	cfile_str2ind $SRCDIR/cmh_uarts.c
+	c_file $SRCDIR/cmh_tsts.c
+	c_file $SRCDIR/cmh_uartf.c
+	c_file $SRCDIR/cmh_uartr.c
+	c_file $SRCDIR/cmh_uarts.c
 fi
 
 # CMH stuff (part 4)
@@ -311,119 +311,119 @@
 # CMH stuff (part 5)
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/cmh_gmmf.c
-	cfile_str2ind $SRCDIR/cmh_gmmq.c
-	cfile_str2ind $SRCDIR/cmh_gmmr.c
-	cfile_str2ind $SRCDIR/cmh_gmms.c
-	cfile_str2ind $SRCDIR/cmh_gpppf.c
-	cfile_str2ind $SRCDIR/cmh_gpppr.c
-	cfile_str2ind $SRCDIR/cmh_gppps.c
-	cfile_str2ind $SRCDIR/cmh_snds.c
-	cfile_str2ind $SRCDIR/cmh_sndr.c
-	cfile_str2ind $SRCDIR/cmh_smf.c
-	cfile_str2ind $SRCDIR/cmh_smq.c
-	cfile_str2ind $SRCDIR/cmh_smr.c
-	cfile_str2ind $SRCDIR/cmh_sms.c
-	cfile_str2ind $SRCDIR/cmh_smt.c
+	c_file $SRCDIR/cmh_gmmf.c
+	c_file $SRCDIR/cmh_gmmq.c
+	c_file $SRCDIR/cmh_gmmr.c
+	c_file $SRCDIR/cmh_gmms.c
+	c_file $SRCDIR/cmh_gpppf.c
+	c_file $SRCDIR/cmh_gpppr.c
+	c_file $SRCDIR/cmh_gppps.c
+	c_file $SRCDIR/cmh_snds.c
+	c_file $SRCDIR/cmh_sndr.c
+	c_file $SRCDIR/cmh_smf.c
+	c_file $SRCDIR/cmh_smq.c
+	c_file $SRCDIR/cmh_smr.c
+	c_file $SRCDIR/cmh_sms.c
+	c_file $SRCDIR/cmh_smt.c
 fi
 
 # CMH stuff (part 6)
-cfile_str2ind $SRCDIR/cmh_cphs.c
-cfile_str2ind $SRCDIR/cmh_dti.c
+c_file $SRCDIR/cmh_cphs.c
+c_file $SRCDIR/cmh_dti.c
 
 # PSA stuff
-cfile_str2ind $SRCDIR/psa_satf.c
-cfile_str2ind $SRCDIR/psa_satp.c
-cfile_str2ind $SRCDIR/psa_sats.c
-cfile_str2ind $SRCDIR/cmh_satf.c
+c_file $SRCDIR/psa_satf.c
+c_file $SRCDIR/psa_satp.c
+c_file $SRCDIR/psa_sats.c
+c_file $SRCDIR/cmh_satf.c
 
-cfile_str2ind $SRCDIR/psa_ccf.c
-cfile_str2ind $SRCDIR/psa_ccp.c
-cfile_str2ind $SRCDIR/psa_ccs.c
-cfile_str2ind $SRCDIR/psa_f.c
+c_file $SRCDIR/psa_ccf.c
+c_file $SRCDIR/psa_ccp.c
+c_file $SRCDIR/psa_ccs.c
+c_file $SRCDIR/psa_f.c
 
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/psa_l2rf.c
-	cfile_str2ind $SRCDIR/psa_l2rp.c
-	cfile_str2ind $SRCDIR/psa_l2rs.c
+	c_file $SRCDIR/psa_l2rf.c
+	c_file $SRCDIR/psa_l2rp.c
+	c_file $SRCDIR/psa_l2rs.c
 fi
 
-cfile_str2ind $SRCDIR/psa_mmf.c
-cfile_str2ind $SRCDIR/psa_mmif.c
-cfile_str2ind $SRCDIR/psa_mmip.c
-cfile_str2ind $SRCDIR/psa_mmis.c
-cfile_str2ind $SRCDIR/psa_mmp.c
-cfile_str2ind $SRCDIR/psa_mms.c
+c_file $SRCDIR/psa_mmf.c
+c_file $SRCDIR/psa_mmif.c
+c_file $SRCDIR/psa_mmip.c
+c_file $SRCDIR/psa_mmis.c
+c_file $SRCDIR/psa_mmp.c
+c_file $SRCDIR/psa_mms.c
 
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/psa_raf.c
-	cfile_str2ind $SRCDIR/psa_rap.c
-	cfile_str2ind $SRCDIR/psa_ras.c
+	c_file $SRCDIR/psa_raf.c
+	c_file $SRCDIR/psa_rap.c
+	c_file $SRCDIR/psa_ras.c
 fi
 
-cfile_str2ind $SRCDIR/psa_simf.c
-cfile_str2ind $SRCDIR/psa_simp.c
-cfile_str2ind $SRCDIR/psa_sims.c
-cfile_str2ind $SRCDIR/psa_smsf.c
-cfile_str2ind $SRCDIR/psa_smsp.c
-cfile_str2ind $SRCDIR/psa_smss.c
-cfile_str2ind $SRCDIR/psa_ssf.c
-cfile_str2ind $SRCDIR/psa_ssp.c
-cfile_str2ind $SRCDIR/psa_sss.c
+c_file $SRCDIR/psa_simf.c
+c_file $SRCDIR/psa_simp.c
+c_file $SRCDIR/psa_sims.c
+c_file $SRCDIR/psa_smsf.c
+c_file $SRCDIR/psa_smsp.c
+c_file $SRCDIR/psa_smss.c
+c_file $SRCDIR/psa_ssf.c
+c_file $SRCDIR/psa_ssp.c
+c_file $SRCDIR/psa_sss.c
 
 if [ "$SRVC" = 1 ]
 then
-	cfile_str2ind $SRCDIR/psa_t30f.c
-	cfile_str2ind $SRCDIR/psa_t30p.c
-	cfile_str2ind $SRCDIR/psa_t30s.c
+	c_file $SRCDIR/psa_t30f.c
+	c_file $SRCDIR/psa_t30p.c
+	c_file $SRCDIR/psa_t30s.c
 fi
 
-cfile_str2ind $SRCDIR/psa_util.c
-cfile_str2ind $SRCDIR/psa_uartp.c
-cfile_str2ind $SRCDIR/psa_uarts.c
+c_file $SRCDIR/psa_util.c
+c_file $SRCDIR/psa_uartp.c
+c_file $SRCDIR/psa_uarts.c
 
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/psa_tras.c
-	cfile_str2ind $SRCDIR/psa_trap.c
+	c_file $SRCDIR/psa_tras.c
+	c_file $SRCDIR/psa_trap.c
 fi
 
-cfile_str2ind $SRCDIR/psa_mtst.c
+c_file $SRCDIR/psa_mtst.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/psa_gmmf.c
-	cfile_str2ind $SRCDIR/psa_gmmp.c
-	cfile_str2ind $SRCDIR/psa_gmms.c
-	cfile_str2ind $SRCDIR/psa_gpppf.c
-	cfile_str2ind $SRCDIR/psa_gpppp.c
-	cfile_str2ind $SRCDIR/psa_gppps.c
-	cfile_str2ind $SRCDIR/psa_sndp.c
-	cfile_str2ind $SRCDIR/psa_snds.c
-	cfile_str2ind $SRCDIR/psa_smf.c
-	cfile_str2ind $SRCDIR/psa_smp.c
-	cfile_str2ind $SRCDIR/psa_sms.c
-	cfile_str2ind $SRCDIR/psa_upmp.c
-	cfile_str2ind $SRCDIR/psa_upms.c
+	c_file $SRCDIR/psa_gmmf.c
+	c_file $SRCDIR/psa_gmmp.c
+	c_file $SRCDIR/psa_gmms.c
+	c_file $SRCDIR/psa_gpppf.c
+	c_file $SRCDIR/psa_gpppp.c
+	c_file $SRCDIR/psa_gppps.c
+	c_file $SRCDIR/psa_sndp.c
+	c_file $SRCDIR/psa_snds.c
+	c_file $SRCDIR/psa_smf.c
+	c_file $SRCDIR/psa_smp.c
+	c_file $SRCDIR/psa_sms.c
+	c_file $SRCDIR/psa_upmp.c
+	c_file $SRCDIR/psa_upms.c
 fi
 
 # miscellaneous stuff
-cfile_str2ind $SRCDIR/sap_dti.c
+c_file $SRCDIR/sap_dti.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/sap_ppp.c
+	c_file $SRCDIR/sap_ppp.c
 fi
 
-cfile_str2ind $SRCDIR/sap_em.c
-cfile_str2ind $SRCDIR/conc_sms.c
-cfile_str2ind $SRCDIR/cphs.c
-cfile_str2ind $SRCDIR/cphs_aci.c
-cfile_str2ind $SRCDIR/line_edit.c
-cfile_str2ind $SRCDIR/line_split.c
-cfile_str2ind $SRCDIR/dcm_f.c
+c_file $SRCDIR/sap_em.c
+c_file $SRCDIR/conc_sms.c
+c_file $SRCDIR/cphs.c
+c_file $SRCDIR/cphs_aci.c
+c_file $SRCDIR/line_edit.c
+c_file $SRCDIR/line_split.c
+c_file $SRCDIR/dcm_f.c
 
 # KSD sourceset, new defines
 
@@ -481,17 +481,17 @@
 
 # New includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # KSD source modules
 
 SRCDIR=$SRC/g23m-aci/ksd
 
-cfile_str2ind $SRCDIR/ksd.c
-cfile_str2ind $SRCDIR/ksd_utl.c
+c_file $SRCDIR/ksd.c
+c_file $SRCDIR/ksd_utl.c
--- a/components/aci_dti_mng	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/aci_dti_mng	Sun Jul 15 22:53:50 2018 +0000
@@ -56,16 +56,16 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # Source modules
 
 SRCDIR=$SRC/g23m-aci/aci_dti_mng
 
-cfile_str2ind $SRCDIR/dti_conn_mng.c
+c_file $SRCDIR/dti_conn_mng.c
--- a/components/aciext	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/aciext	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version aci_ext
-cfile_plain aci_ext_version.c
+c_file aci_ext_version.c
 
 # Defines
 
@@ -69,14 +69,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_ext"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -104,4 +104,4 @@
 
 SRCDIR=$SRC/g23m-aci/aci_ext
 
-cfile_str2ind $SRCDIR/aci_ext_pers.c
+c_file $SRCDIR/aci_ext_pers.c
--- a/components/alr	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/alr	Sun Jul 15 22:53:50 2018 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=
 
 make_version alr
-cfile_plain alr_version.c
+c_file alr_version.c
 
 # Defines
 
@@ -65,10 +65,10 @@
 
 SRCDIR=$SRC/aci2/alr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -95,22 +95,22 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/alr_cs.c
-cfile_str2ind $SRCDIR/alr_csf.c
-cfile_str2ind $SRCDIR/alr_main.c
-cfile_str2ind $SRCDIR/alr_nc.c
-cfile_str2ind $SRCDIR/alr_pch.c
-cfile_str2ind $SRCDIR/alr_pei.c
-cfile_str2ind $SRCDIR/alr_rach.c
-cfile_str2ind $SRCDIR/alr_sc.c
-cfile_str2ind $SRCDIR/alr_dedi.c
-cfile_str2ind $SRCDIR/alr_mmi.c
-cfile_str2ind $SRCDIR/alr_cbch.c
-cfile_str2ind $SRCDIR/alr_trc.c
-cfile_str2ind $SRCDIR/alr_tim.c
-cfile_str2ind $SRCDIR/alr_em.c
+c_file $SRCDIR/alr_cs.c
+c_file $SRCDIR/alr_csf.c
+c_file $SRCDIR/alr_main.c
+c_file $SRCDIR/alr_nc.c
+c_file $SRCDIR/alr_pch.c
+c_file $SRCDIR/alr_pei.c
+c_file $SRCDIR/alr_rach.c
+c_file $SRCDIR/alr_sc.c
+c_file $SRCDIR/alr_dedi.c
+c_file $SRCDIR/alr_mmi.c
+c_file $SRCDIR/alr_cbch.c
+c_file $SRCDIR/alr_trc.c
+c_file $SRCDIR/alr_tim.c
+c_file $SRCDIR/alr_em.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/alr_gprs.c
+	c_file $SRCDIR/alr_gprs.c
 fi
--- a/components/atiext	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/atiext	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version ati_ext
-cfile_plain ati_ext_version.c
+c_file ati_ext_version.c
 
 # Defines
 
@@ -62,16 +62,16 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ati_ext"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # Source modules
 
 SRCDIR=$SRC/g23m-aci/ati_ext
 
-cfile_str2ind $SRCDIR/ati_ext_mech.c
+c_file $SRCDIR/ati_ext_mech.c
--- a/components/audio	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/audio	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -46,31 +46,31 @@
 
 SRCDIR=$SRC/cs/services/Audio
 
-cfile_plain $SRCDIR/audio_env.c
-cfile_plain $SRCDIR/audio_api.c
-cfile_plain $SRCDIR/audio_error_hdlr.c
-cfile_plain $SRCDIR/audio_task.c
-cfile_plain $SRCDIR/audio_keybeep.c
-cfile_plain $SRCDIR/audio_tones.c
-cfile_plain $SRCDIR/audio_melody_E1.c
-cfile_plain $SRCDIR/audio_melody_E2.c
-cfile_plain $SRCDIR/audio_ffs.c
-cfile_plain $SRCDIR/audio_vm.c
-cfile_plain $SRCDIR/audio_vm_play.c
-cfile_plain $SRCDIR/audio_vm_record.c
-cfile_plain $SRCDIR/audio_compatibilities.c
-cfile_plain $SRCDIR/audio_sr_enroll.c
-cfile_plain $SRCDIR/audio_sr_update.c
-cfile_plain $SRCDIR/audio_sr_reco.c
-cfile_plain $SRCDIR/audio_sr.c
-cfile_plain $SRCDIR/audio_mode.c
-cfile_plain $SRCDIR/audio_mode_full_write.c
-cfile_plain $SRCDIR/audio_mode_load.c
-cfile_plain $SRCDIR/audio_mode_save.c
-cfile_plain $SRCDIR/audio_mode_drivers.c
-cfile_plain $SRCDIR/audio_mode_volume.c
-cfile_plain $SRCDIR/audio_midi.c
-cfile_plain $SRCDIR/audio_vm_amr.c
-cfile_plain $SRCDIR/audio_vm_amr_play.c
-cfile_plain $SRCDIR/audio_vm_amr_record.c
-cfile_plain $SRCDIR/audio_driver.c
+c_file $SRCDIR/audio_env.c
+c_file $SRCDIR/audio_api.c
+c_file $SRCDIR/audio_error_hdlr.c
+c_file $SRCDIR/audio_task.c
+c_file $SRCDIR/audio_keybeep.c
+c_file $SRCDIR/audio_tones.c
+c_file $SRCDIR/audio_melody_E1.c
+c_file $SRCDIR/audio_melody_E2.c
+c_file $SRCDIR/audio_ffs.c
+c_file $SRCDIR/audio_vm.c
+c_file $SRCDIR/audio_vm_play.c
+c_file $SRCDIR/audio_vm_record.c
+c_file $SRCDIR/audio_compatibilities.c
+c_file $SRCDIR/audio_sr_enroll.c
+c_file $SRCDIR/audio_sr_update.c
+c_file $SRCDIR/audio_sr_reco.c
+c_file $SRCDIR/audio_sr.c
+c_file $SRCDIR/audio_mode.c
+c_file $SRCDIR/audio_mode_full_write.c
+c_file $SRCDIR/audio_mode_load.c
+c_file $SRCDIR/audio_mode_save.c
+c_file $SRCDIR/audio_mode_drivers.c
+c_file $SRCDIR/audio_mode_volume.c
+c_file $SRCDIR/audio_midi.c
+c_file $SRCDIR/audio_vm_amr.c
+c_file $SRCDIR/audio_vm_amr_play.c
+c_file $SRCDIR/audio_vm_amr_record.c
+c_file $SRCDIR/audio_driver.c
--- a/components/audio_bgd	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/audio_bgd	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,5 +35,5 @@
 
 SRCDIR=$SRC/cs/services/Audio/Audio_bgd
 
-cfile_plain $SRCDIR/audio_bgd_env.c
-cfile_plain $SRCDIR/audio_bgd_task.c
+c_file $SRCDIR/audio_bgd_env.c
+c_file $SRCDIR/audio_bgd_task.c
--- a/components/bootloader	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/bootloader	Sun Jul 15 22:53:50 2018 +0000
@@ -44,8 +44,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -67,10 +67,10 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
 
-cfile_plain $SRCDIR/cmdboot.c
-cfile_plain $SRCDIR/command.c
-cfile_plain $SRCDIR/convert.c
-cfile_plain $SRCDIR/optboot.c
-cfile_plain $SRCDIR/serial.c
-cfile_plain $SRCDIR/start.c
-cfile_plain $SRCDIR/boot.c
+c_file $SRCDIR/cmdboot.c
+c_file $SRCDIR/command.c
+c_file $SRCDIR/convert.c
+c_file $SRCDIR/optboot.c
+c_file $SRCDIR/serial.c
+c_file $SRCDIR/start.c
+c_file $SRCDIR/boot.c
--- a/components/buzzer	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/buzzer	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,4 +35,4 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/buzzer
 
-cfile_plain $SRCDIR/buzzer.c
+c_file $SRCDIR/buzzer.c
--- a/components/cc	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/cc	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version cc
-cfile_plain cc_version.c
+c_file cc_version.c
 
 # Defines
 
@@ -39,24 +39,24 @@
 
 SRCDIR=$SRC/g23m-gsm/cc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/cc_act.c
-cfile_str2ind $SRCDIR/cc_cfk.c
-cfile_str2ind $SRCDIR/cc_csf.c
-cfile_str2ind $SRCDIR/cc_est.c
-cfile_str2ind $SRCDIR/cc_ffk.c
-cfile_str2ind $SRCDIR/cc_for.c
-cfile_str2ind $SRCDIR/cc_pei.c
-cfile_str2ind $SRCDIR/cc_rel.c
-cfile_str2ind $SRCDIR/cc_srv.c
-cfile_str2ind $SRCDIR/cc_time.c
-cfile_str2ind $SRCDIR/cc_em.c
+c_file $SRCDIR/cc_act.c
+c_file $SRCDIR/cc_cfk.c
+c_file $SRCDIR/cc_csf.c
+c_file $SRCDIR/cc_est.c
+c_file $SRCDIR/cc_ffk.c
+c_file $SRCDIR/cc_for.c
+c_file $SRCDIR/cc_pei.c
+c_file $SRCDIR/cc_rel.c
+c_file $SRCDIR/cc_srv.c
+c_file $SRCDIR/cc_time.c
+c_file $SRCDIR/cc_em.c
--- a/components/ccd_na7_db	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ccd_na7_db	Sun Jul 15 22:53:50 2018 +0000
@@ -10,68 +10,68 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
 
 # Source modules
 
 SRCDIR=$SRC/gpf3/ccd
 
-cfile_plain $SRCDIR/ccd.c
-cfile_plain $SRCDIR/bitfun.c
-cfile_plain $SRCDIR/cdc_std.c
-cfile_plain $SRCDIR/cdc_com.c
-cfile_plain $SRCDIR/ccd_err.c
-cfile_plain $SRCDIR/ccd_store.c
-cfile_plain $SRCDIR/gsm1_tv.c
-cfile_plain $SRCDIR/gsm1_v.c
-cfile_plain $SRCDIR/gsm2_t.c
-cfile_plain $SRCDIR/gsm3_tv.c
-cfile_plain $SRCDIR/gsm3_v.c
-cfile_plain $SRCDIR/gsm4_lv.c
-cfile_plain $SRCDIR/gsm4_tlv.c
-cfile_plain $SRCDIR/gsm5_tlv.c
-cfile_plain $SRCDIR/gsm5_tv.c
-cfile_plain $SRCDIR/gsm5_v.c
-cfile_plain $SRCDIR/gsm6_tlv.c
-cfile_plain $SRCDIR/gsm7_lv.c
-cfile_plain $SRCDIR/bcd_mnc.c
-cfile_plain $SRCDIR/bcd_nofill.c
-cfile_plain $SRCDIR/bcdeven.c
-cfile_plain $SRCDIR/bcdodd.c
-cfile_plain $SRCDIR/gsm1_asn.c
-cfile_plain $SRCDIR/csn1_s1.c
-cfile_plain $SRCDIR/csn1_sh.c
-cfile_plain $SRCDIR/s_padding.c
-cfile_plain $SRCDIR/t30_ident.c
-cfile_plain $SRCDIR/asn1_bitstr.c
-cfile_plain $SRCDIR/asn1_octet.c
-cfile_plain $SRCDIR/asn1_integ.c
-cfile_plain $SRCDIR/asn1_seq.c
-cfile_plain $SRCDIR/asn1_choice.c
-cfile_plain $SRCDIR/no_code.c
-cfile_plain $SRCDIR/asn1_choice_ext.c
-cfile_plain $SRCDIR/asn1_seq_ext.c
-cfile_plain $SRCDIR/asn1_integ_ext.c
-cfile_plain $SRCDIR/asn1_opentype.c
-cfile_plain $SRCDIR/asn1_objid.c
-cfile_plain $SRCDIR/noncritical_ext.c
-cfile_plain $SRCDIR/critical_ext.c
-cfile_plain $SRCDIR/ccd_elem.c
-cfile_plain $SRCDIR/s_padding_0.c
-cfile_plain $SRCDIR/csn1_s0.c
-cfile_plain $SRCDIR/hl_flag.c
-cfile_plain $SRCDIR/freq_list.c
-cfile_plain $SRCDIR/fdd_ci.c
-cfile_plain $SRCDIR/tdd_ci.c
-cfile_plain $SRCDIR/freq_list_com.c
-cfile_plain $SRCDIR/csn1_concat.c
-cfile_plain $SRCDIR/break_cond.c
-cfile_plain $SRCDIR/csn1_sx.c
-cfile_plain $SRCDIR/csn1_choice_1.c
-cfile_plain $SRCDIR/csn1_choice_2.c
-cfile_plain $SRCDIR/csn1_choice_x.c
-cfile_plain $SRCDIR/csn1_sh_opt.c
-cfile_plain $SRCDIR/csn1_s1_opt.c
-cfile_plain $SRCDIR/csn1_s0_opt.c
+c_file $SRCDIR/ccd.c
+c_file $SRCDIR/bitfun.c
+c_file $SRCDIR/cdc_std.c
+c_file $SRCDIR/cdc_com.c
+c_file $SRCDIR/ccd_err.c
+c_file $SRCDIR/ccd_store.c
+c_file $SRCDIR/gsm1_tv.c
+c_file $SRCDIR/gsm1_v.c
+c_file $SRCDIR/gsm2_t.c
+c_file $SRCDIR/gsm3_tv.c
+c_file $SRCDIR/gsm3_v.c
+c_file $SRCDIR/gsm4_lv.c
+c_file $SRCDIR/gsm4_tlv.c
+c_file $SRCDIR/gsm5_tlv.c
+c_file $SRCDIR/gsm5_tv.c
+c_file $SRCDIR/gsm5_v.c
+c_file $SRCDIR/gsm6_tlv.c
+c_file $SRCDIR/gsm7_lv.c
+c_file $SRCDIR/bcd_mnc.c
+c_file $SRCDIR/bcd_nofill.c
+c_file $SRCDIR/bcdeven.c
+c_file $SRCDIR/bcdodd.c
+c_file $SRCDIR/gsm1_asn.c
+c_file $SRCDIR/csn1_s1.c
+c_file $SRCDIR/csn1_sh.c
+c_file $SRCDIR/s_padding.c
+c_file $SRCDIR/t30_ident.c
+c_file $SRCDIR/asn1_bitstr.c
+c_file $SRCDIR/asn1_octet.c
+c_file $SRCDIR/asn1_integ.c
+c_file $SRCDIR/asn1_seq.c
+c_file $SRCDIR/asn1_choice.c
+c_file $SRCDIR/no_code.c
+c_file $SRCDIR/asn1_choice_ext.c
+c_file $SRCDIR/asn1_seq_ext.c
+c_file $SRCDIR/asn1_integ_ext.c
+c_file $SRCDIR/asn1_opentype.c
+c_file $SRCDIR/asn1_objid.c
+c_file $SRCDIR/noncritical_ext.c
+c_file $SRCDIR/critical_ext.c
+c_file $SRCDIR/ccd_elem.c
+c_file $SRCDIR/s_padding_0.c
+c_file $SRCDIR/csn1_s0.c
+c_file $SRCDIR/hl_flag.c
+c_file $SRCDIR/freq_list.c
+c_file $SRCDIR/fdd_ci.c
+c_file $SRCDIR/tdd_ci.c
+c_file $SRCDIR/freq_list_com.c
+c_file $SRCDIR/csn1_concat.c
+c_file $SRCDIR/break_cond.c
+c_file $SRCDIR/csn1_sx.c
+c_file $SRCDIR/csn1_choice_1.c
+c_file $SRCDIR/csn1_choice_2.c
+c_file $SRCDIR/csn1_choice_x.c
+c_file $SRCDIR/csn1_sh_opt.c
+c_file $SRCDIR/csn1_s1_opt.c
+c_file $SRCDIR/csn1_s0_opt.c
--- a/components/ccddata	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ccddata	Sun Jul 15 22:53:50 2018 +0000
@@ -5,17 +5,17 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 # Source modules
 
 SRCDIR=$SRC/gpf3/ccd
 
-cfile_plain $SRCDIR/ccd_config.c
-cfile_plain $SRCDIR/ccddata_mconst.c
-cfile_plain $SRCDIR/ccddata_ccdmtab.c
-cfile_plain $SRCDIR/ccddata_cdemval.c
-cfile_plain $SRCDIR/ccddata_ccdent.c
-cfile_plain $SRCDIR/ccddata_ccd.c
+c_file $SRCDIR/ccd_config.c
+c_file $SRCDIR/ccddata_mconst.c
+c_file $SRCDIR/ccddata_ccdmtab.c
+c_file $SRCDIR/ccddata_cdemval.c
+c_file $SRCDIR/ccddata_ccdent.c
+c_file $SRCDIR/ccddata_ccd.c
--- a/components/cci	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/cci	Sun Jul 15 22:53:50 2018 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I.."
@@ -86,11 +86,11 @@
 
 SRCDIR=$SRC/g23m-gprs/cci
 
-cfile_str2ind $SRCDIR/cci_gea_start.c
-cfile_str2ind $SRCDIR/cci_fbsf.c
-#cfile_str2ind $SRCDIR/cci_fbsp.c
-cfile_str2ind $SRCDIR/cci_fbss.c
-cfile_str2ind $SRCDIR/cci_hw_sim.c
-cfile_str2ind $SRCDIR/cci_qf.c
-cfile_str2ind $SRCDIR/cci_qp.c
-cfile_str2ind $SRCDIR/cci_qs.c
+c_file $SRCDIR/cci_gea_start.c
+c_file $SRCDIR/cci_fbsf.c
+#c_file $SRCDIR/cci_fbsp.c
+c_file $SRCDIR/cci_fbss.c
+c_file $SRCDIR/cci_hw_sim.c
+c_file $SRCDIR/cci_qf.c
+c_file $SRCDIR/cci_qp.c
+c_file $SRCDIR/cci_qs.c
--- a/components/cci_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/cci_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I.."
@@ -86,4 +86,4 @@
 
 SRCDIR=$SRC/g23m-gprs/cci
 
-cfile_str2ind $SRCDIR/cci_gea_start.c
+c_file $SRCDIR/cci_gea_start.c
--- a/components/cl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/cl	Sun Jul 15 22:53:50 2018 +0000
@@ -53,16 +53,16 @@
 
 SRCDIR=$SRC/g23m-gprs/cl
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/cl_nwrl.c
-cfile_str2ind $SRCDIR/clqos.c
+c_file $SRCDIR/cl_nwrl.c
+c_file $SRCDIR/clqos.c
--- a/components/comlib	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/comlib	Sun Jul 15 22:53:50 2018 +0000
@@ -22,11 +22,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -56,16 +56,16 @@
 
 if [ "$SRVC" != 0 ]
 then
-	cfile_str2ind $SRCDIR/cl_ribu.c
+	c_file $SRCDIR/cl_ribu.c
 fi
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/cl_rlcmac.c
+	c_file $SRCDIR/cl_rlcmac.c
 fi
 
-cfile_str2ind $SRCDIR/cl_md5.c
-cfile_str2ind $SRCDIR/cl_imei.c
-cfile_str2ind $SRCDIR/cl_des.c
-cfile_str2ind $SRCDIR/cl_shrd.c
-cfile_str2ind $SRCDIR/cl_list.c
+c_file $SRCDIR/cl_md5.c
+c_file $SRCDIR/cl_imei.c
+c_file $SRCDIR/cl_des.c
+c_file $SRCDIR/cl_shrd.c
+c_file $SRCDIR/cl_list.c
--- a/components/config_gprs_fl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/config_gprs_fl	Sun Jul 15 22:53:50 2018 +0000
@@ -60,12 +60,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -94,7 +94,7 @@
 
 SRCDIR=$SRC/condat2/frame/config
 
-cfile_str2ind $SRCDIR/gprscomp.c
-cfile_str2ind $SRCDIR/custcomp.c
-cfile_str2ind $SRCDIR/gprsinit.c
-cfile_str2ind $SRCDIR/gprsdrv.c
+c_file $SRCDIR/gprscomp.c
+c_file $SRCDIR/custcomp.c
+c_file $SRCDIR/gprsinit.c
+c_file $SRCDIR/gprsdrv.c
--- a/components/config_gprs_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/config_gprs_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -60,12 +60,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -94,4 +94,4 @@
 
 SRCDIR=$SRC/condat2/frame/config
 
-cfile_str2ind $SRCDIR/gprscomp.c
+c_file $SRCDIR/gprscomp.c
--- a/components/config_gsm_fl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/config_gsm_fl	Sun Jul 15 22:53:50 2018 +0000
@@ -62,12 +62,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -96,7 +96,7 @@
 
 SRCDIR=$SRC/condat2/com/src/config
 
-cfile_str2ind $SRCDIR/gsmcomp.c
-cfile_str2ind $SRCDIR/custcomp.c
-cfile_str2ind $SRCDIR/gsminit.c
-cfile_str2ind $SRCDIR/gsmdrv.c
+c_file $SRCDIR/gsmcomp.c
+c_file $SRCDIR/custcomp.c
+c_file $SRCDIR/gsminit.c
+c_file $SRCDIR/gsmdrv.c
--- a/components/config_gsm_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/config_gsm_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -62,12 +62,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -96,4 +96,4 @@
 
 SRCDIR=$SRC/condat2/com/src/config
 
-cfile_str2ind $SRCDIR/gsmcomp.c
+c_file $SRCDIR/gsmcomp.c
--- a/components/cst	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/cst	Sun Jul 15 22:53:50 2018 +0000
@@ -22,14 +22,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -64,7 +64,7 @@
 
 SRCDIR=$SRC/cs/services/cst
 
-cfile_plain $SRCDIR/cst_csf.c
-cfile_plain $SRCDIR/cst_exts.c
-cfile_plain $SRCDIR/cst_pei.c
-cfile_plain $SRCDIR/cst_stack.c
+c_file $SRCDIR/cst_csf.c
+c_file $SRCDIR/cst_exts.c
+c_file $SRCDIR/cst_pei.c
+c_file $SRCDIR/cst_stack.c
--- a/components/dar	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/dar	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -44,12 +44,12 @@
 
 SRCDIR=$SRC/cs/services/dar
 
-cfile_plain $SRCDIR/dar_env.c
-cfile_plain $SRCDIR/dar_api.c
-cfile_plain $SRCDIR/dar_task.c
-cfile_plain $SRCDIR/dar_handle_message.c
-cfile_plain $SRCDIR/dar_diagnose.c
-cfile_plain $SRCDIR/dar_error_hdlr.c
-cfile_plain $SRCDIR/dar_msg_ft.c
-cfile_plain $SRCDIR/dar_watchdog.c
-cfile_plain $SRCDIR/dar_emergency.c
+c_file $SRCDIR/dar_env.c
+c_file $SRCDIR/dar_api.c
+c_file $SRCDIR/dar_task.c
+c_file $SRCDIR/dar_handle_message.c
+c_file $SRCDIR/dar_diagnose.c
+c_file $SRCDIR/dar_error_hdlr.c
+c_file $SRCDIR/dar_msg_ft.c
+c_file $SRCDIR/dar_watchdog.c
+c_file $SRCDIR/dar_emergency.c
--- a/components/dar_gbl_var	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/dar_gbl_var	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -44,4 +44,4 @@
 
 SRCDIR=$SRC/cs/services/dar
 
-cfile_plain $SRCDIR/dar_gbl_var.c
+c_file $SRCDIR/dar_gbl_var.c
--- a/components/dl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/dl	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version dl
-cfile_plain dl_version.c
+c_file dl_version.c
 
 # Defines
 
@@ -48,25 +48,25 @@
 
 SRCDIR=$SRC/g23m-gsm/dl
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/dl_com.c
-cfile_str2ind $SRCDIR/dl_dph.c
-cfile_str2ind $SRCDIR/dl_drr.c
-cfile_str2ind $SRCDIR/dl_pei.c
-cfile_str2ind $SRCDIR/dl_dcch0.c
-cfile_str2ind $SRCDIR/dl_dcch3.c
-cfile_str2ind $SRCDIR/dl_sacch0.c
-cfile_str2ind $SRCDIR/dl_state.c
-cfile_str2ind $SRCDIR/dl_trace.c
-cfile_str2ind $SRCDIR/dl_signal.c
-cfile_str2ind $SRCDIR/dl_trc.c
-cfile_str2ind $SRCDIR/dl_em.c
+c_file $SRCDIR/dl_com.c
+c_file $SRCDIR/dl_dph.c
+c_file $SRCDIR/dl_drr.c
+c_file $SRCDIR/dl_pei.c
+c_file $SRCDIR/dl_dcch0.c
+c_file $SRCDIR/dl_dcch3.c
+c_file $SRCDIR/dl_sacch0.c
+c_file $SRCDIR/dl_state.c
+c_file $SRCDIR/dl_trace.c
+c_file $SRCDIR/dl_signal.c
+c_file $SRCDIR/dl_trc.c
+c_file $SRCDIR/dl_em.c
--- a/components/drivers_flash	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/drivers_flash	Sun Jul 15 22:53:50 2018 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -44,28 +44,28 @@
 
 # 1st set of source modules
 
-cfile_plain $SRCDIR/dsp_dwnld/leadapi.c
-cfile_plain $SRCDIR/inth/niq.c
-cfile_plain $SRCDIR/uart/uart.c
-cfile_plain $SRCDIR/inth/inth.c
-cfile_plain $SRCDIR/timer/timer.c
-cfile_plain $SRCDIR/timer/timer1.c
-cfile_plain $SRCDIR/timer/timer2.c
-cfile_plain $SRCDIR/timer/timer_sec.c
-cfile_plain $SRCDIR/security/certificate.c
-cfile_plain $SRCDIR/clkm/clkm.c
-cfile_plain $SRCDIR/armio/armio.c
+c_file $SRCDIR/dsp_dwnld/leadapi.c
+c_file $SRCDIR/inth/niq.c
+c_file $SRCDIR/uart/uart.c
+c_file $SRCDIR/inth/inth.c
+c_file $SRCDIR/timer/timer.c
+c_file $SRCDIR/timer/timer1.c
+c_file $SRCDIR/timer/timer2.c
+c_file $SRCDIR/timer/timer_sec.c
+c_file $SRCDIR/security/certificate.c
+c_file $SRCDIR/clkm/clkm.c
+c_file $SRCDIR/armio/armio.c
 
 # 2nd set of source modules
 
 CFLAGS="-me -pw2 -mn -mt"
 
-cfile_plain $SRCDIR/spi/spi_drv.c
-cfile_plain $SRCDIR/abb/abb.c
-cfile_plain $SRCDIR/abb/abb_core_inth.c
+c_file $SRCDIR/spi/spi_drv.c
+c_file $SRCDIR/abb/abb.c
+c_file $SRCDIR/abb/abb_core_inth.c
 
 # niq32
 
 CFLAGS="-me -pw2 -x -o -mw"
 
-cfile_plain $SRCDIR/inth/niq32.c
+c_file $SRCDIR/inth/niq32.c
--- a/components/dti	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/dti	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version dti
-cfile_plain dti_version.c
+c_file dti_version.c
 
 # Defines
 
@@ -49,12 +49,12 @@
 
 SRCDIR=$SRC/g23m-aci/dti
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -80,6 +80,6 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/dti_kerf.c
-cfile_str2ind $SRCDIR/dti_kerp.c
-cfile_str2ind $SRCDIR/dti_int.c
+c_file $SRCDIR/dti_kerf.c
+c_file $SRCDIR/dti_kerp.c
+c_file $SRCDIR/dti_int.c
--- a/components/etm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/etm	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -44,11 +44,11 @@
 
 SRCDIR=$SRC/cs/services/etm
 
-cfile_plain $SRCDIR/etm_task.c
-cfile_plain $SRCDIR/etm_env.c
-cfile_plain $SRCDIR/etm_api.c
-cfile_plain $SRCDIR/etm_trace.c
-cfile_plain $SRCDIR/etm_at.c
-cfile_plain $SRCDIR/etm_audio.c
-cfile_plain $SRCDIR/etm_tmcore.c
-cfile_plain $SRCDIR/etm_tmpwr.c
+c_file $SRCDIR/etm_task.c
+c_file $SRCDIR/etm_env.c
+c_file $SRCDIR/etm_api.c
+c_file $SRCDIR/etm_trace.c
+c_file $SRCDIR/etm_at.c
+c_file $SRCDIR/etm_audio.c
+c_file $SRCDIR/etm_tmcore.c
+c_file $SRCDIR/etm_tmpwr.c
--- a/components/fad	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/fad	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version fad
-cfile_plain fad_version.c
+c_file fad_version.c
 
 # Defines
 
@@ -54,26 +54,26 @@
 
 SRCDIR=$SRC/g23m-fad/fad
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/fad_kerf.c
-cfile_str2ind $SRCDIR/fad_kerp.c
-cfile_str2ind $SRCDIR/fad_kers.c
-cfile_str2ind $SRCDIR/fad_pei.c
-cfile_str2ind $SRCDIR/fad_rbm.c
-cfile_str2ind $SRCDIR/fad_rcvf.c
-cfile_str2ind $SRCDIR/fad_rcvp.c
-cfile_str2ind $SRCDIR/fad_rcvs.c
-cfile_str2ind $SRCDIR/fad_sbm.c
-cfile_str2ind $SRCDIR/fad_sndf.c
-cfile_str2ind $SRCDIR/fad_sndp.c
-cfile_str2ind $SRCDIR/fad_snds.c
-cfile_str2ind $SRCDIR/fad_tim.c
+c_file $SRCDIR/fad_kerf.c
+c_file $SRCDIR/fad_kerp.c
+c_file $SRCDIR/fad_kers.c
+c_file $SRCDIR/fad_pei.c
+c_file $SRCDIR/fad_rbm.c
+c_file $SRCDIR/fad_rcvf.c
+c_file $SRCDIR/fad_rcvp.c
+c_file $SRCDIR/fad_rcvs.c
+c_file $SRCDIR/fad_sbm.c
+c_file $SRCDIR/fad_sndf.c
+c_file $SRCDIR/fad_sndp.c
+c_file $SRCDIR/fad_snds.c
+c_file $SRCDIR/fad_tim.c
--- a/components/fchg	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/fchg	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,10 +35,10 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/fchg
 
-cfile_plain $SRCDIR/fchg_api.c
-cfile_plain $SRCDIR/fchg_default_batt.c
-cfile_plain $SRCDIR/fchg_env.c
-cfile_plain $SRCDIR/fchg_ffs_init.c
-cfile_plain $SRCDIR/fchg_messages.c
-cfile_plain $SRCDIR/fchg_process.c
-cfile_plain $SRCDIR/fchg_task.c
+c_file $SRCDIR/fchg_api.c
+c_file $SRCDIR/fchg_default_batt.c
+c_file $SRCDIR/fchg_env.c
+c_file $SRCDIR/fchg_ffs_init.c
+c_file $SRCDIR/fchg_messages.c
+c_file $SRCDIR/fchg_process.c
+c_file $SRCDIR/fchg_task.c
--- a/components/ffs	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ffs	Sun Jul 15 22:53:50 2018 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -43,13 +43,13 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/ffs/board
 
-cfile_plain $SRCDIR/amdsbdrv.c
-cfile_plain $SRCDIR/core.c
-cfile_plain $SRCDIR/drv.c
-cfile_plain $SRCDIR/ffstrace.c
-cfile_plain $SRCDIR/fsck.c
-cfile_plain $SRCDIR/intelsbdrv.c
-cfile_plain $SRCDIR/reclaim.c
+c_file $SRCDIR/amdsbdrv.c
+c_file $SRCDIR/core.c
+c_file $SRCDIR/drv.c
+c_file $SRCDIR/ffstrace.c
+c_file $SRCDIR/fsck.c
+c_file $SRCDIR/intelsbdrv.c
+c_file $SRCDIR/reclaim.c
 
 # ffs_target.c generation
 
@@ -59,4 +59,4 @@
 	>> $BUILD_DIR/$LIBNAME/Makefile
 echo >> $BUILD_DIR/$LIBNAME/Makefile
 
-cfile_plain ffs_target.c
+c_file ffs_target.c
--- a/components/ffs_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ffs_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -52,11 +52,11 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/ffs/board
 
-cfile_plain $SRCDIR/cfgffs.c
-cfile_plain $SRCDIR/dev.c
-cfile_plain $SRCDIR/pcmcode.c
-cfile_plain $SRCDIR/task.c
-cfile_plain $SRCDIR/tmffs.c
+c_file $SRCDIR/cfgffs.c
+c_file $SRCDIR/dev.c
+c_file $SRCDIR/pcmcode.c
+c_file $SRCDIR/task.c
+c_file $SRCDIR/tmffs.c
 
 # Different CFLAGS and CPPFLAGS for ffs_env.c
 
@@ -68,8 +68,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -91,4 +91,4 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
 
-cfile_plain $SRCDIR/ffs_env.c
+c_file $SRCDIR/ffs_env.c
--- a/components/ffs_pcm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ffs_pcm	Sun Jul 15 22:53:50 2018 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -42,4 +42,4 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/ffs/board
 
-cfile_plain $SRCDIR/pcmdata.c
+c_file $SRCDIR/pcmdata.c
--- a/components/frame_na7_db_fl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/frame_na7_db_fl	Sun Jul 15 22:53:50 2018 +0000
@@ -9,30 +9,30 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
 
 # Source modules
 
 SRCDIR=$SRC/gpf3/frame
 
-cfile_plain $SRCDIR/frame.c
-cfile_plain $SRCDIR/vsi_sem.c
-cfile_plain $SRCDIR/vsi_com.c
-cfile_plain $SRCDIR/vsi_mem.c
-cfile_plain $SRCDIR/vsi_tim.c
-cfile_plain $SRCDIR/vsi_mis.c
-cfile_plain $SRCDIR/vsi_drv.c
-cfile_plain $SRCDIR/vsi_trc.c
-cfile_plain $SRCDIR/vsi_pro.c
-cfile_plain $SRCDIR/xalert.c
-cfile_plain $SRCDIR/route.c
-cfile_plain $SRCDIR/prf_func.c
-cfile_plain $SRCDIR/frm_ext.c
-cfile_plain $SRCDIR/frame_version.c
+c_file $SRCDIR/frame.c
+c_file $SRCDIR/vsi_sem.c
+c_file $SRCDIR/vsi_com.c
+c_file $SRCDIR/vsi_mem.c
+c_file $SRCDIR/vsi_tim.c
+c_file $SRCDIR/vsi_mis.c
+c_file $SRCDIR/vsi_drv.c
+c_file $SRCDIR/vsi_trc.c
+c_file $SRCDIR/vsi_pro.c
+c_file $SRCDIR/xalert.c
+c_file $SRCDIR/route.c
+c_file $SRCDIR/prf_func.c
+c_file $SRCDIR/frm_ext.c
+c_file $SRCDIR/frame_version.c
 
 # OSL
 
@@ -41,11 +41,11 @@
 
 SRCDIR=$SRC/gpf2/osl
 
-cfile_plain $SRCDIR/os_com_fl.c
-cfile_plain $SRCDIR/os_drv.c
-cfile_plain $SRCDIR/os_isr.c
-cfile_plain $SRCDIR/os_mem_fl.c
-cfile_plain $SRCDIR/os_mis_fl.c
-cfile_plain $SRCDIR/os_pro_fl.c
-cfile_plain $SRCDIR/os_sem_fl.c
-cfile_plain $SRCDIR/os_tim_fl.c
+c_file $SRCDIR/os_com_fl.c
+c_file $SRCDIR/os_drv.c
+c_file $SRCDIR/os_isr.c
+c_file $SRCDIR/os_mem_fl.c
+c_file $SRCDIR/os_mis_fl.c
+c_file $SRCDIR/os_pro_fl.c
+c_file $SRCDIR/os_sem_fl.c
+c_file $SRCDIR/os_tim_fl.c
--- a/components/frame_na7_db_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/frame_na7_db_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -9,30 +9,30 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
 
 # Source modules
 
 SRCDIR=$SRC/gpf3/frame
 
-cfile_plain $SRCDIR/frame.c
-cfile_plain $SRCDIR/vsi_sem.c
-cfile_plain $SRCDIR/vsi_com.c
-cfile_plain $SRCDIR/vsi_mem.c
-cfile_plain $SRCDIR/vsi_tim.c
-cfile_plain $SRCDIR/vsi_mis.c
-cfile_plain $SRCDIR/vsi_drv.c
-cfile_plain $SRCDIR/vsi_trc.c
-cfile_plain $SRCDIR/vsi_pro.c
-cfile_plain $SRCDIR/xalert.c
-cfile_plain $SRCDIR/route.c
-cfile_plain $SRCDIR/prf_func.c
-cfile_plain $SRCDIR/frm_ext.c
-cfile_plain $SRCDIR/frame_version.c
+c_file $SRCDIR/frame.c
+c_file $SRCDIR/vsi_sem.c
+c_file $SRCDIR/vsi_com.c
+c_file $SRCDIR/vsi_mem.c
+c_file $SRCDIR/vsi_tim.c
+c_file $SRCDIR/vsi_mis.c
+c_file $SRCDIR/vsi_drv.c
+c_file $SRCDIR/vsi_trc.c
+c_file $SRCDIR/vsi_pro.c
+c_file $SRCDIR/xalert.c
+c_file $SRCDIR/route.c
+c_file $SRCDIR/prf_func.c
+c_file $SRCDIR/frm_ext.c
+c_file $SRCDIR/frame_version.c
 
 # OSL
 
@@ -41,9 +41,9 @@
 
 SRCDIR=$SRC/gpf2/osl
 
-cfile_plain $SRCDIR/os_com_ir.c
-cfile_plain $SRCDIR/os_mem_ir.c
-cfile_plain $SRCDIR/os_mis_ir.c
-cfile_plain $SRCDIR/os_pro_ir.c
-cfile_plain $SRCDIR/os_sem_ir.c
-cfile_plain $SRCDIR/os_tim_ir.c
+c_file $SRCDIR/os_com_ir.c
+c_file $SRCDIR/os_mem_ir.c
+c_file $SRCDIR/os_mis_ir.c
+c_file $SRCDIR/os_pro_ir.c
+c_file $SRCDIR/os_sem_ir.c
+c_file $SRCDIR/os_tim_ir.c
--- a/components/gdi	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/gdi	Sun Jul 15 22:53:50 2018 +0000
@@ -75,13 +75,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/driver"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -109,14 +109,14 @@
 
 SRCDIR=$SRC/condat2/com/src/driver
 
-cfile_str2ind $SRCDIR/audio.c
-cfile_str2ind $SRCDIR/display.c
-cfile_str2ind $SRCDIR/keypad.c
-cfile_str2ind $SRCDIR/light.c
-cfile_str2ind $SRCDIR/power.c
-cfile_str2ind $SRCDIR/rx.c
-cfile_str2ind $SRCDIR/em.c
-cfile_str2ind $SRCDIR/rtc.c
-cfile_str2ind $SRCDIR/vmd.c
-cfile_str2ind $SRCDIR/font_bitmaps.c
-cfile_str2ind $SRCDIR/ffs_coat.c
+c_file $SRCDIR/audio.c
+c_file $SRCDIR/display.c
+c_file $SRCDIR/keypad.c
+c_file $SRCDIR/light.c
+c_file $SRCDIR/power.c
+c_file $SRCDIR/rx.c
+c_file $SRCDIR/em.c
+c_file $SRCDIR/rtc.c
+c_file $SRCDIR/vmd.c
+c_file $SRCDIR/font_bitmaps.c
+c_file $SRCDIR/ffs_coat.c
--- a/components/gmm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/gmm	Sun Jul 15 22:53:50 2018 +0000
@@ -53,12 +53,12 @@
 
 SRCDIR=$SRC/g23m-gprs/gmm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -85,22 +85,22 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/gmm_f.c
-cfile_str2ind $SRCDIR/gmm_pei.c
-cfile_str2ind $SRCDIR/gmm_kernf.c
-cfile_str2ind $SRCDIR/gmm_kernl.c
-cfile_str2ind $SRCDIR/gmm_kernp.c
-cfile_str2ind $SRCDIR/gmm_kerns.c
-cfile_str2ind $SRCDIR/gmm_txf.c
-cfile_str2ind $SRCDIR/gmm_txp.c
-cfile_str2ind $SRCDIR/gmm_txs.c
-cfile_str2ind $SRCDIR/gmm_rxf.c
-cfile_str2ind $SRCDIR/gmm_rxp.c
-cfile_str2ind $SRCDIR/gmm_rxs.c
-cfile_str2ind $SRCDIR/gmm_rdyf.c
-cfile_str2ind $SRCDIR/gmm_rdyp.c
-cfile_str2ind $SRCDIR/gmm_rdys.c
-cfile_str2ind $SRCDIR/gmm_syncf.c
-cfile_str2ind $SRCDIR/gmm_syncp.c
-cfile_str2ind $SRCDIR/gmm_syncs.c
-cfile_str2ind $SRCDIR/gmm_em.c
+c_file $SRCDIR/gmm_f.c
+c_file $SRCDIR/gmm_pei.c
+c_file $SRCDIR/gmm_kernf.c
+c_file $SRCDIR/gmm_kernl.c
+c_file $SRCDIR/gmm_kernp.c
+c_file $SRCDIR/gmm_kerns.c
+c_file $SRCDIR/gmm_txf.c
+c_file $SRCDIR/gmm_txp.c
+c_file $SRCDIR/gmm_txs.c
+c_file $SRCDIR/gmm_rxf.c
+c_file $SRCDIR/gmm_rxp.c
+c_file $SRCDIR/gmm_rxs.c
+c_file $SRCDIR/gmm_rdyf.c
+c_file $SRCDIR/gmm_rdyp.c
+c_file $SRCDIR/gmm_rdys.c
+c_file $SRCDIR/gmm_syncf.c
+c_file $SRCDIR/gmm_syncp.c
+c_file $SRCDIR/gmm_syncs.c
+c_file $SRCDIR/gmm_em.c
--- a/components/grlc	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/grlc	Sun Jul 15 22:53:50 2018 +0000
@@ -54,34 +54,34 @@
 
 SRCDIR=$SRC/g23m-gprs/grlc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/grlc_f.c
-cfile_str2ind $SRCDIR/grlc_gfff.c
-cfile_str2ind $SRCDIR/grlc_gffp.c
-cfile_str2ind $SRCDIR/grlc_gffs.c
-cfile_str2ind $SRCDIR/grlc_measf.c
-cfile_str2ind $SRCDIR/grlc_measp.c
-cfile_str2ind $SRCDIR/grlc_meass.c
-cfile_str2ind $SRCDIR/grlc_pei.c
-cfile_str2ind $SRCDIR/grlc_rdf.c
-cfile_str2ind $SRCDIR/grlc_rdp.c
-cfile_str2ind $SRCDIR/grlc_rds.c
-cfile_str2ind $SRCDIR/grlc_ruf.c
-cfile_str2ind $SRCDIR/grlc_rup.c
-cfile_str2ind $SRCDIR/grlc_rus.c
-cfile_str2ind $SRCDIR/grlc_tmf.c
-cfile_str2ind $SRCDIR/grlc_tmp.c
-cfile_str2ind $SRCDIR/grlc_tms.c
-cfile_str2ind $SRCDIR/grlc_tpcg.c
-cfile_str2ind $SRCDIR/grlc_tpcs.c
-cfile_str2ind $SRCDIR/grlc_em.c
+c_file $SRCDIR/grlc_f.c
+c_file $SRCDIR/grlc_gfff.c
+c_file $SRCDIR/grlc_gffp.c
+c_file $SRCDIR/grlc_gffs.c
+c_file $SRCDIR/grlc_measf.c
+c_file $SRCDIR/grlc_measp.c
+c_file $SRCDIR/grlc_meass.c
+c_file $SRCDIR/grlc_pei.c
+c_file $SRCDIR/grlc_rdf.c
+c_file $SRCDIR/grlc_rdp.c
+c_file $SRCDIR/grlc_rds.c
+c_file $SRCDIR/grlc_ruf.c
+c_file $SRCDIR/grlc_rup.c
+c_file $SRCDIR/grlc_rus.c
+c_file $SRCDIR/grlc_tmf.c
+c_file $SRCDIR/grlc_tmp.c
+c_file $SRCDIR/grlc_tms.c
+c_file $SRCDIR/grlc_tpcg.c
+c_file $SRCDIR/grlc_tpcs.c
+c_file $SRCDIR/grlc_em.c
--- a/components/grlc_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/grlc_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -55,15 +55,15 @@
 
 SRCDIR=$SRC/g23m-gprs/grlc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/grlc_func.c
+c_file $SRCDIR/grlc_func.c
--- a/components/grr	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/grr	Sun Jul 15 22:53:50 2018 +0000
@@ -54,12 +54,12 @@
 
 SRCDIR=$SRC/g23m-gprs/grr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -85,29 +85,29 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/grr_cpapf.c
-cfile_str2ind $SRCDIR/grr_cpapp.c
-cfile_str2ind $SRCDIR/grr_cpaps.c
-cfile_str2ind $SRCDIR/grr_csf.c
-cfile_str2ind $SRCDIR/grr_csp.c
-cfile_str2ind $SRCDIR/grr_css.c
-cfile_str2ind $SRCDIR/grr_ctrlf.c
-cfile_str2ind $SRCDIR/grr_ctrlp.c
-cfile_str2ind $SRCDIR/grr_ctrls.c
-cfile_str2ind $SRCDIR/grr_em.c
-cfile_str2ind $SRCDIR/grr_f.c
-cfile_str2ind $SRCDIR/grr_gfpf.c
-cfile_str2ind $SRCDIR/grr_gfpp.c
-cfile_str2ind $SRCDIR/grr_meass.c
-cfile_str2ind $SRCDIR/grr_measp.c
-cfile_str2ind $SRCDIR/grr_measf.c
-cfile_str2ind $SRCDIR/grr_pei.c
-cfile_str2ind $SRCDIR/grr_pgf.c
-cfile_str2ind $SRCDIR/grr_pgp.c
-cfile_str2ind $SRCDIR/grr_pgs.c
-cfile_str2ind $SRCDIR/grr_psif.c
-cfile_str2ind $SRCDIR/grr_psip.c
-cfile_str2ind $SRCDIR/grr_psis.c
-cfile_str2ind $SRCDIR/grr_tcf.c
-cfile_str2ind $SRCDIR/grr_tcp.c
-cfile_str2ind $SRCDIR/grr_tcs.c
+c_file $SRCDIR/grr_cpapf.c
+c_file $SRCDIR/grr_cpapp.c
+c_file $SRCDIR/grr_cpaps.c
+c_file $SRCDIR/grr_csf.c
+c_file $SRCDIR/grr_csp.c
+c_file $SRCDIR/grr_css.c
+c_file $SRCDIR/grr_ctrlf.c
+c_file $SRCDIR/grr_ctrlp.c
+c_file $SRCDIR/grr_ctrls.c
+c_file $SRCDIR/grr_em.c
+c_file $SRCDIR/grr_f.c
+c_file $SRCDIR/grr_gfpf.c
+c_file $SRCDIR/grr_gfpp.c
+c_file $SRCDIR/grr_meass.c
+c_file $SRCDIR/grr_measp.c
+c_file $SRCDIR/grr_measf.c
+c_file $SRCDIR/grr_pei.c
+c_file $SRCDIR/grr_pgf.c
+c_file $SRCDIR/grr_pgp.c
+c_file $SRCDIR/grr_pgs.c
+c_file $SRCDIR/grr_psif.c
+c_file $SRCDIR/grr_psip.c
+c_file $SRCDIR/grr_psis.c
+c_file $SRCDIR/grr_tcf.c
+c_file $SRCDIR/grr_tcp.c
+c_file $SRCDIR/grr_tcs.c
--- a/components/kpd	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/kpd	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,13 +35,13 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/kpd
 
-cfile_plain $SRCDIR/kpd_api.c
-cfile_plain $SRCDIR/kpd_functions.c
-cfile_plain $SRCDIR/kpd_power_api.c
-cfile_plain $SRCDIR/kpd_process_internal_msg.c
-cfile_plain $SRCDIR/kpd_virtual_key_table_mgt.c
-cfile_plain $SRCDIR/kpd_env.c
-cfile_plain $SRCDIR/kpd_handle_message.c
-cfile_plain $SRCDIR/kpd_handle_timer.c
-cfile_plain $SRCDIR/kpd_task.c
-cfile_plain $SRCDIR/board/kpd_scan_functions.c
+c_file $SRCDIR/kpd_api.c
+c_file $SRCDIR/kpd_functions.c
+c_file $SRCDIR/kpd_power_api.c
+c_file $SRCDIR/kpd_process_internal_msg.c
+c_file $SRCDIR/kpd_virtual_key_table_mgt.c
+c_file $SRCDIR/kpd_env.c
+c_file $SRCDIR/kpd_handle_message.c
+c_file $SRCDIR/kpd_handle_timer.c
+c_file $SRCDIR/kpd_task.c
+c_file $SRCDIR/board/kpd_scan_functions.c
--- a/components/l1_custom_ext	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l1_custom_ext	Sun Jul 15 22:53:50 2018 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
@@ -52,6 +52,6 @@
 
 SRCDIR=$SRC/cs/layer1
 
-cfile_plain $SRCDIR/audio_cust0/l1audio_cust.c
-cfile_plain $SRCDIR/tm_cust0/l1tm_cust.c
-cfile_plain $SRCDIR/tm_cust0/l1tm_tpu${RF}.c
+c_file $SRCDIR/audio_cust0/l1audio_cust.c
+c_file $SRCDIR/tm_cust0/l1tm_cust.c
+c_file $SRCDIR/tm_cust0/l1tm_tpu${RF}.c
--- a/components/l1_custom_int	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l1_custom_int	Sun Jul 15 22:53:50 2018 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
@@ -52,5 +52,5 @@
 
 SRCDIR=$SRC/cs/layer1
 
-cfile_plain $SRCDIR/cust0/l1_cust.c
-cfile_plain $SRCDIR/cust0/ind_os.c
+c_file $SRCDIR/cust0/l1_cust.c
+c_file $SRCDIR/cust0/ind_os.c
--- a/components/l1_ext	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l1_ext	Sun Jul 15 22:53:50 2018 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
@@ -52,79 +52,79 @@
 
 SRCDIR=$SRC/cs/layer1
 
-cfile_plain $SRCDIR/cfile/l1_pwmgr.c
-cfile_plain $SRCDIR/cfile/l1_afunc.c
-cfile_plain $SRCDIR/cfile/l1_trace.c
-cfile_plain $SRCDIR/cfile/l1_init.c
-cfile_plain $SRCDIR/cfile/l1_sync.c
-cfile_plain $SRCDIR/cfile/l1_cmplx.c
+c_file $SRCDIR/cfile/l1_pwmgr.c
+c_file $SRCDIR/cfile/l1_afunc.c
+c_file $SRCDIR/cfile/l1_trace.c
+c_file $SRCDIR/cfile/l1_init.c
+c_file $SRCDIR/cfile/l1_sync.c
+c_file $SRCDIR/cfile/l1_cmplx.c
 
-cfile_plain $SRCDIR/tm_cfile/l1tm_async.c
-cfile_plain $SRCDIR/tm_cfile/l1tm_func.c
-cfile_plain $SRCDIR/tm_cfile/l1tm_stats.c
+c_file $SRCDIR/tm_cfile/l1tm_async.c
+c_file $SRCDIR/tm_cfile/l1tm_func.c
+c_file $SRCDIR/tm_cfile/l1tm_stats.c
 
-cfile_plain $SRCDIR/audio_cfile/l1audio_async.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_afunc.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_init.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_drive.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_back.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_abb.c
+c_file $SRCDIR/audio_cfile/l1audio_async.c
+c_file $SRCDIR/audio_cfile/l1audio_afunc.c
+c_file $SRCDIR/audio_cfile/l1audio_init.c
+c_file $SRCDIR/audio_cfile/l1audio_drive.c
+c_file $SRCDIR/audio_cfile/l1audio_back.c
+c_file $SRCDIR/audio_cfile/l1audio_abb.c
 
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_async.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_sync.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_func.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_drive.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_init.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_back.c
-#cfile_plain $SRCDIR/gtt_cfile/l1gtt_baudot_functions.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/conv_encoder.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/conv_poly.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/ctm_receiver.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/ctm_transmitter.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/diag_interleaver.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/m_sequence.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/ucs_functions.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/diag_deinterleaver.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/fifo.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/init_interleaver.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_async.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_sync.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_func.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_drive.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_init.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_back.c
+#c_file $SRCDIR/gtt_cfile/l1gtt_baudot_functions.c
+#c_file $SRCDIR/gtt_cfile/ctm/conv_encoder.c
+#c_file $SRCDIR/gtt_cfile/ctm/conv_poly.c
+#c_file $SRCDIR/gtt_cfile/ctm/ctm_receiver.c
+#c_file $SRCDIR/gtt_cfile/ctm/ctm_transmitter.c
+#c_file $SRCDIR/gtt_cfile/ctm/diag_interleaver.c
+#c_file $SRCDIR/gtt_cfile/ctm/m_sequence.c
+#c_file $SRCDIR/gtt_cfile/ctm/ucs_functions.c
+#c_file $SRCDIR/gtt_cfile/ctm/diag_deinterleaver.c
+#c_file $SRCDIR/gtt_cfile/ctm/fifo.c
+#c_file $SRCDIR/gtt_cfile/ctm/init_interleaver.c
 
 if [ "$L1_DYN_DSP_DWNLD" = 1 ]
 then
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_afunc.c
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_async.c
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_init.c
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_sync.c
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c
-	cfile_plain $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_func.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/tty_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/amr_mms_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/amr_sch_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/e2_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/speech_acoustic_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/Dyn_dwnld/gprs_patch_file36_10.c
-	cfile_plain $SRCDIR/dsp1/patch_file36_10_dyn_dwl.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_afunc.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_async.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_init.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_sync.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c
+	c_file $SRCDIR/dyn_dwl_cfile/l1_dyn_dwl_func.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/tty_patch_file36_10.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/amr_mms_patch_file36_10.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/amr_sch_patch_file36_10.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/e2_patch_file36_10.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/speech_acoustic_patch_file36_10.c
+	c_file $SRCDIR/dsp1/Dyn_dwnld/gprs_patch_file36_10.c
+	c_file $SRCDIR/dsp1/patch_file36_10_dyn_dwl.c
 else
-	cfile_plain $SRCDIR/dsp1/patch_file${DSP}_${CHIPSET}.c
+	c_file $SRCDIR/dsp1/patch_file${DSP}_${CHIPSET}.c
 fi
 
-cfile_plain $SRCDIR/dsp1/leadboot.c
+c_file $SRCDIR/dsp1/leadboot.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_plain $SRCDIR/p_cfile/l1p_afun.c
-	cfile_plain $SRCDIR/p_cfile/l1p_asyn.c
-	cfile_plain $SRCDIR/p_cfile/l1p_cmpl.c
-	cfile_plain $SRCDIR/p_cfile/l1p_sync.c
+	c_file $SRCDIR/p_cfile/l1p_afun.c
+	c_file $SRCDIR/p_cfile/l1p_asyn.c
+	c_file $SRCDIR/p_cfile/l1p_cmpl.c
+	c_file $SRCDIR/p_cfile/l1p_sync.c
 fi
 
 # Different CFLAGS for l1_small.c
 
 CFLAGS="-g -me -pw2 -mw"
 
-cfile_plain $SRCDIR/cfile/l1_small.c
+c_file $SRCDIR/cfile/l1_small.c
 
 # Different again for l1_async.c
 
 CFLAGS="-g -me -pw2 -mt -mw -o1"
 
-cfile_plain $SRCDIR/cfile/l1_async.c
+c_file $SRCDIR/cfile/l1_async.c
--- a/components/l1_int	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l1_int	Sun Jul 15 22:53:50 2018 +0000
@@ -41,7 +41,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
@@ -83,30 +83,30 @@
 
 # Source modules
 
-cfile_plain $SRCDIR/cfile/l1_func.c
-cfile_plain $SRCDIR/cfile/l1_drive.c
-cfile_plain $SRCDIR/cfile/l1_mfmgr.c
-cfile_plain $SRCDIR/cfile/l1_ctl.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_func.c
-cfile_plain $SRCDIR/audio_cfile/l1audio_sync.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/viterbi.c
-#cfile_plain $SRCDIR/gtt_cfile/ctm/wait_for_sync.c
-cfile_plain $SRCDIR/dl1/dl1_com.c
-cfile_plain $SRCDIR/cfile/l1_api_hisr.c
+c_file $SRCDIR/cfile/l1_func.c
+c_file $SRCDIR/cfile/l1_drive.c
+c_file $SRCDIR/cfile/l1_mfmgr.c
+c_file $SRCDIR/cfile/l1_ctl.c
+c_file $SRCDIR/audio_cfile/l1audio_func.c
+c_file $SRCDIR/audio_cfile/l1audio_sync.c
+#c_file $SRCDIR/gtt_cfile/ctm/viterbi.c
+#c_file $SRCDIR/gtt_cfile/ctm/wait_for_sync.c
+c_file $SRCDIR/dl1/dl1_com.c
+c_file $SRCDIR/cfile/l1_api_hisr.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_plain $SRCDIR/p_cfile/l1p_ctl.c
-	cfile_plain $SRCDIR/p_cfile/l1p_func.c
-	cfile_plain $SRCDIR/p_cfile/l1p_driv.c
-	cfile_plain $SRCDIR/cmacs/macs.c
+	c_file $SRCDIR/p_cfile/l1p_ctl.c
+	c_file $SRCDIR/p_cfile/l1p_func.c
+	c_file $SRCDIR/p_cfile/l1p_driv.c
+	c_file $SRCDIR/cmacs/macs.c
 fi
 
-cfile_plain l1_cmplx_intram.c
-cfile_plain l1_sync_intram.c
+c_file l1_cmplx_intram.c
+c_file l1_sync_intram.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_plain l1p_cmpl_intram.c
-	cfile_plain l1p_sync_intram.c
+	c_file l1p_cmpl_intram.c
+	c_file l1p_sync_intram.c
 fi
--- a/components/l1_pei	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l1_pei	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version l1 l1_pei
-cfile_plain l1_pei_version.c
+c_file l1_pei_version.c
 
 # Defines
 
@@ -39,13 +39,13 @@
 
 SRCDIR=$SRC/g23m-gsm/l1
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/l1_pei.c
+c_file $SRCDIR/l1_pei.c
--- a/components/l2r	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/l2r	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version l2r
-cfile_plain l2r_version.c
+c_file l2r_version.c
 
 # Defines
 
@@ -50,10 +50,10 @@
 
 SRCDIR=$SRC/g23m-fad/l2r
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -80,23 +80,23 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/l2r_dnf.c
-cfile_str2ind $SRCDIR/l2r_dnp.c
-cfile_str2ind $SRCDIR/l2r_dns.c
-cfile_str2ind $SRCDIR/l2r_mgtf.c
-cfile_str2ind $SRCDIR/l2r_mgtp.c
-cfile_str2ind $SRCDIR/l2r_mgts.c
-cfile_str2ind $SRCDIR/l2r_pei.c
-cfile_str2ind $SRCDIR/l2r_ups.c
-cfile_str2ind $SRCDIR/l2r_tim.c
-cfile_str2ind $SRCDIR/l2r_upf.c
-cfile_str2ind $SRCDIR/l2r_upp.c
-cfile_str2ind $SRCDIR/tra_mgts.c
-cfile_str2ind $SRCDIR/tra_mgtf.c
-cfile_str2ind $SRCDIR/tra_mgtp.c
-cfile_str2ind $SRCDIR/tra_dns.c
-cfile_str2ind $SRCDIR/tra_dnf.c
-cfile_str2ind $SRCDIR/tra_dnp.c
-cfile_str2ind $SRCDIR/tra_ups.c
-cfile_str2ind $SRCDIR/tra_upf.c
-cfile_str2ind $SRCDIR/tra_upp.c
+c_file $SRCDIR/l2r_dnf.c
+c_file $SRCDIR/l2r_dnp.c
+c_file $SRCDIR/l2r_dns.c
+c_file $SRCDIR/l2r_mgtf.c
+c_file $SRCDIR/l2r_mgtp.c
+c_file $SRCDIR/l2r_mgts.c
+c_file $SRCDIR/l2r_pei.c
+c_file $SRCDIR/l2r_ups.c
+c_file $SRCDIR/l2r_tim.c
+c_file $SRCDIR/l2r_upf.c
+c_file $SRCDIR/l2r_upp.c
+c_file $SRCDIR/tra_mgts.c
+c_file $SRCDIR/tra_mgtf.c
+c_file $SRCDIR/tra_mgtp.c
+c_file $SRCDIR/tra_dns.c
+c_file $SRCDIR/tra_dnf.c
+c_file $SRCDIR/tra_dnp.c
+c_file $SRCDIR/tra_ups.c
+c_file $SRCDIR/tra_upf.c
+c_file $SRCDIR/tra_upp.c
--- a/components/llc	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/llc	Sun Jul 15 22:53:50 2018 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I.."
@@ -66,36 +66,36 @@
 
 SRCDIR=$SRC/g23m-gprs/llc
 
-cfile_str2ind $SRCDIR/llc_f.c
-cfile_str2ind $SRCDIR/llc_irxf.c
-cfile_str2ind $SRCDIR/llc_irxl.c
-cfile_str2ind $SRCDIR/llc_irxp.c
-cfile_str2ind $SRCDIR/llc_irxs.c
-cfile_str2ind $SRCDIR/llc_itxf.c
-cfile_str2ind $SRCDIR/llc_itxp.c
-cfile_str2ind $SRCDIR/llc_itxs.c
-cfile_str2ind $SRCDIR/llc_itxt.c
-cfile_str2ind $SRCDIR/llc_llmef.c
-cfile_str2ind $SRCDIR/llc_llmep.c
-cfile_str2ind $SRCDIR/llc_llmes.c
-cfile_str2ind $SRCDIR/llc_pei.c
-cfile_str2ind $SRCDIR/llc_rxf.c
-cfile_str2ind $SRCDIR/llc_rxp.c
-cfile_str2ind $SRCDIR/llc_rxs.c
-cfile_str2ind $SRCDIR/llc_t200f.c
-cfile_str2ind $SRCDIR/llc_t200p.c
-cfile_str2ind $SRCDIR/llc_t200s.c
-cfile_str2ind $SRCDIR/llc_txf.c
-cfile_str2ind $SRCDIR/llc_txl.c
-cfile_str2ind $SRCDIR/llc_txp.c
-cfile_str2ind $SRCDIR/llc_txs.c
-cfile_str2ind $SRCDIR/llc_uf.c
-cfile_str2ind $SRCDIR/llc_uirxf.c
-cfile_str2ind $SRCDIR/llc_uirxp.c
-cfile_str2ind $SRCDIR/llc_uirxs.c
-cfile_str2ind $SRCDIR/llc_uitxf.c
-cfile_str2ind $SRCDIR/llc_uitxp.c
-cfile_str2ind $SRCDIR/llc_uitxs.c
-cfile_str2ind $SRCDIR/llc_up.c
-cfile_str2ind $SRCDIR/llc_us.c
-cfile_str2ind $SRCDIR/llc_ul.c
+c_file $SRCDIR/llc_f.c
+c_file $SRCDIR/llc_irxf.c
+c_file $SRCDIR/llc_irxl.c
+c_file $SRCDIR/llc_irxp.c
+c_file $SRCDIR/llc_irxs.c
+c_file $SRCDIR/llc_itxf.c
+c_file $SRCDIR/llc_itxp.c
+c_file $SRCDIR/llc_itxs.c
+c_file $SRCDIR/llc_itxt.c
+c_file $SRCDIR/llc_llmef.c
+c_file $SRCDIR/llc_llmep.c
+c_file $SRCDIR/llc_llmes.c
+c_file $SRCDIR/llc_pei.c
+c_file $SRCDIR/llc_rxf.c
+c_file $SRCDIR/llc_rxp.c
+c_file $SRCDIR/llc_rxs.c
+c_file $SRCDIR/llc_t200f.c
+c_file $SRCDIR/llc_t200p.c
+c_file $SRCDIR/llc_t200s.c
+c_file $SRCDIR/llc_txf.c
+c_file $SRCDIR/llc_txl.c
+c_file $SRCDIR/llc_txp.c
+c_file $SRCDIR/llc_txs.c
+c_file $SRCDIR/llc_uf.c
+c_file $SRCDIR/llc_uirxf.c
+c_file $SRCDIR/llc_uirxp.c
+c_file $SRCDIR/llc_uirxs.c
+c_file $SRCDIR/llc_uitxf.c
+c_file $SRCDIR/llc_uitxp.c
+c_file $SRCDIR/llc_uitxs.c
+c_file $SRCDIR/llc_up.c
+c_file $SRCDIR/llc_us.c
+c_file $SRCDIR/llc_ul.c
--- a/components/lls	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/lls	Sun Jul 15 22:53:50 2018 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,6 +35,6 @@
 
 SRCDIR=$SRC/cs/services/lls
 
-cfile_plain $SRCDIR/lls_api.c
-cfile_plain $SRCDIR/lls_env.c
-cfile_plain $SRCDIR/lls_functions.c
+c_file $SRCDIR/lls_api.c
+c_file $SRCDIR/lls_env.c
+c_file $SRCDIR/lls_functions.c
--- a/components/main	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/main	Sun Jul 15 22:53:50 2018 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -52,16 +52,16 @@
 
 SRCDIR=$SRC/cs/system/Main
 
-cfile_plain $SRCDIR/init.c
-cfile_plain $SRCDIR/create_RVtasks.c
-cfile_plain $SRCDIR/main.c
-cfile_plain $SRCDIR/sys_dummy.c
+c_file $SRCDIR/init.c
+c_file $SRCDIR/create_RVtasks.c
+c_file $SRCDIR/main.c
+c_file $SRCDIR/sys_dummy.c
 
 # Different CFLAGS for mem_load.c
 
 CFLAGS="-o -mw -me -pw2"
 
-cfile_plain $SRCDIR/mem_load.c
+c_file $SRCDIR/mem_load.c
 
 # Assembly module
 
--- a/components/misc_na7_db_fl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/misc_na7_db_fl	Sun Jul 15 22:53:50 2018 +0000
@@ -9,15 +9,15 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
 
 SRCDIR=$SRC/gpf2/misc
 
-cfile_plain $SRCDIR/printtofile.c
-cfile_plain $SRCDIR/tok.c
-cfile_plain $SRCDIR/tools.c
-cfile_plain $SRCDIR/misc_version.c
+c_file $SRCDIR/printtofile.c
+c_file $SRCDIR/tok.c
+c_file $SRCDIR/tools.c
+c_file $SRCDIR/misc_version.c
--- a/components/misc_na7_db_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/misc_na7_db_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -9,15 +9,15 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
 
 SRCDIR=$SRC/gpf2/misc
 
-cfile_plain $SRCDIR/printtofile.c
-cfile_plain $SRCDIR/tok.c
-cfile_plain $SRCDIR/tools.c
-cfile_plain $SRCDIR/misc_version.c
+c_file $SRCDIR/printtofile.c
+c_file $SRCDIR/tok.c
+c_file $SRCDIR/tools.c
+c_file $SRCDIR/misc_version.c
--- a/components/mm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/mm	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version mm
-cfile_plain mm_version.c
+c_file mm_version.c
 
 # Defines
 
@@ -62,10 +62,10 @@
 
 SRCDIR=$SRC/g23m-gsm/mm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -92,24 +92,24 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/mm_csf.c
-cfile_str2ind $SRCDIR/mm_forf.c
-cfile_str2ind $SRCDIR/mm_forp.c
-cfile_str2ind $SRCDIR/mm_mmf.c
-cfile_str2ind $SRCDIR/mm_mmp.c
-cfile_str2ind $SRCDIR/mm_mms.c
-cfile_str2ind $SRCDIR/mm_pei.c
-cfile_str2ind $SRCDIR/mm_regf.c
-cfile_str2ind $SRCDIR/mm_regp.c
-cfile_str2ind $SRCDIR/mm_regs.c
-cfile_str2ind $SRCDIR/mm_tim.c
-cfile_str2ind $SRCDIR/mm_fors.c
+c_file $SRCDIR/mm_csf.c
+c_file $SRCDIR/mm_forf.c
+c_file $SRCDIR/mm_forp.c
+c_file $SRCDIR/mm_mmf.c
+c_file $SRCDIR/mm_mmp.c
+c_file $SRCDIR/mm_mms.c
+c_file $SRCDIR/mm_pei.c
+c_file $SRCDIR/mm_regf.c
+c_file $SRCDIR/mm_regp.c
+c_file $SRCDIR/mm_regs.c
+c_file $SRCDIR/mm_tim.c
+c_file $SRCDIR/mm_fors.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/mm_gmm.c
-	cfile_str2ind $SRCDIR/mm_gprs.c
-	cfile_str2ind $SRCDIR/mm_gprsp.c
+	c_file $SRCDIR/mm_gmm.c
+	c_file $SRCDIR/mm_gprs.c
+	c_file $SRCDIR/mm_gprsp.c
 fi
 
-cfile_str2ind $SRCDIR/mm_em.c
+c_file $SRCDIR/mm_em.c
--- a/components/osx_na7_db	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/osx_na7_db	Sun Jul 15 22:53:50 2018 +0000
@@ -8,12 +8,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
 
 # Source modules
 
 SRCDIR=$SRC/gpf2/frame/cust_os
 
-cfile_plain $SRCDIR/osx.c
+c_file $SRCDIR/osx.c
--- a/components/power	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/power	Sun Jul 15 22:53:50 2018 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -43,4 +43,4 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/power
 
-cfile_plain $SRCDIR/board/power.c
+c_file $SRCDIR/board/power.c
--- a/components/ppp	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ppp	Sun Jul 15 22:53:50 2018 +0000
@@ -51,49 +51,49 @@
 
 SRCDIR=$SRC/g23m-fad/ppp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/ppp_arbf.c
-cfile_str2ind $SRCDIR/ppp_arbp.c
-cfile_str2ind $SRCDIR/ppp_arbs.c
-cfile_str2ind $SRCDIR/ppp_frxf.c
-cfile_str2ind $SRCDIR/ppp_frxp.c
-cfile_str2ind $SRCDIR/ppp_frxs.c
-cfile_str2ind $SRCDIR/ppp_ftxf.c
-#cfile_str2ind $SRCDIR/ppp_ftxp.c
-cfile_str2ind $SRCDIR/ppp_ftxs.c
-cfile_str2ind $SRCDIR/ppp_lcpf.c
-cfile_str2ind $SRCDIR/ppp_lcpp.c
-cfile_str2ind $SRCDIR/ppp_lcps.c
-cfile_str2ind $SRCDIR/ppp_onaf.c
-cfile_str2ind $SRCDIR/ppp_onap.c
-cfile_str2ind $SRCDIR/ppp_onas.c
-cfile_str2ind $SRCDIR/ppp_ncpf.c
-cfile_str2ind $SRCDIR/ppp_ncpp.c
-cfile_str2ind $SRCDIR/ppp_ncps.c
-cfile_str2ind $SRCDIR/ppp_papf.c
-cfile_str2ind $SRCDIR/ppp_papp.c
-cfile_str2ind $SRCDIR/ppp_paps.c
-cfile_str2ind $SRCDIR/ppp_capf.c
-cfile_str2ind $SRCDIR/ppp_capp.c
-cfile_str2ind $SRCDIR/ppp_caps.c
-cfile_str2ind $SRCDIR/ppp_pei.c
-cfile_str2ind $SRCDIR/ppp_prxf.c
-cfile_str2ind $SRCDIR/ppp_prxp.c
-cfile_str2ind $SRCDIR/ppp_prxs.c
-cfile_str2ind $SRCDIR/ppp_ptxf.c
-cfile_str2ind $SRCDIR/ppp_ptxp.c
-cfile_str2ind $SRCDIR/ppp_ptxs.c
-cfile_str2ind $SRCDIR/ppp_rtf.c
-cfile_str2ind $SRCDIR/ppp_rtp.c
-cfile_str2ind $SRCDIR/ppp_rts.c
-cfile_str2ind $SRCDIR/ppp_tbls.c
+c_file $SRCDIR/ppp_arbf.c
+c_file $SRCDIR/ppp_arbp.c
+c_file $SRCDIR/ppp_arbs.c
+c_file $SRCDIR/ppp_frxf.c
+c_file $SRCDIR/ppp_frxp.c
+c_file $SRCDIR/ppp_frxs.c
+c_file $SRCDIR/ppp_ftxf.c
+#c_file $SRCDIR/ppp_ftxp.c
+c_file $SRCDIR/ppp_ftxs.c
+c_file $SRCDIR/ppp_lcpf.c
+c_file $SRCDIR/ppp_lcpp.c
+c_file $SRCDIR/ppp_lcps.c
+c_file $SRCDIR/ppp_onaf.c
+c_file $SRCDIR/ppp_onap.c
+c_file $SRCDIR/ppp_onas.c
+c_file $SRCDIR/ppp_ncpf.c
+c_file $SRCDIR/ppp_ncpp.c
+c_file $SRCDIR/ppp_ncps.c
+c_file $SRCDIR/ppp_papf.c
+c_file $SRCDIR/ppp_papp.c
+c_file $SRCDIR/ppp_paps.c
+c_file $SRCDIR/ppp_capf.c
+c_file $SRCDIR/ppp_capp.c
+c_file $SRCDIR/ppp_caps.c
+c_file $SRCDIR/ppp_pei.c
+c_file $SRCDIR/ppp_prxf.c
+c_file $SRCDIR/ppp_prxp.c
+c_file $SRCDIR/ppp_prxs.c
+c_file $SRCDIR/ppp_ptxf.c
+c_file $SRCDIR/ppp_ptxp.c
+c_file $SRCDIR/ppp_ptxs.c
+c_file $SRCDIR/ppp_rtf.c
+c_file $SRCDIR/ppp_rtp.c
+c_file $SRCDIR/ppp_rts.c
+c_file $SRCDIR/ppp_tbls.c
--- a/components/ppp_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ppp_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -51,17 +51,17 @@
 
 SRCDIR=$SRC/g23m-fad/ppp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/ppp_frxf.c
-cfile_str2ind $SRCDIR/ppp_ftxf.c
-cfile_str2ind $SRCDIR/ppp_tbls.c
+c_file $SRCDIR/ppp_frxf.c
+c_file $SRCDIR/ppp_ftxf.c
+c_file $SRCDIR/ppp_tbls.c
--- a/components/ra	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ra	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version ra
-cfile_plain ra_version.c
+c_file ra_version.c
 
 # Defines
 
@@ -49,24 +49,24 @@
 
 SRCDIR=$SRC/g23m-fad/ra
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/ra_tra.c
-cfile_str2ind $SRCDIR/ra_shm.c
-cfile_str2ind $SRCDIR/ra_rlp.c
-cfile_str2ind $SRCDIR/ra_l1int.c
+c_file $SRCDIR/ra_tra.c
+c_file $SRCDIR/ra_shm.c
+c_file $SRCDIR/ra_rlp.c
+c_file $SRCDIR/ra_l1int.c
 
 if [ "$SRVC" = 1 ]
 then
-	cfile_str2ind $SRCDIR/ra_fax.c
+	c_file $SRCDIR/ra_fax.c
 fi
 
-cfile_str2ind $SRCDIR/ra_dll.c
+c_file $SRCDIR/ra_dll.c
--- a/components/riviera_core_flash	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/riviera_core_flash	Sun Jul 15 22:53:50 2018 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,17 +35,17 @@
 
 SRCDIR=$SRC/cs/riviera
 
-cfile_plain $SRCDIR/rvf/rvf_buffer.c
-cfile_plain $SRCDIR/rvf/rvf_msg.c
-cfile_plain $SRCDIR/rvf/rvf_task.c
-cfile_plain $SRCDIR/rvf/rvf_time.c
-cfile_plain $SRCDIR/rvm/rvm_api.c
-cfile_plain $SRCDIR/rvm/rvm_group_swe.c
-cfile_plain $SRCDIR/rvm/rvm_mem.c
-cfile_plain $SRCDIR/rvm/rvm_swe_db.c
-cfile_plain $SRCDIR/rvm/rvm_swe_hdlr.c
-cfile_plain $SRCDIR/rvm/rvm_task.c
-cfile_plain $SRCDIR/support/exception.c
-cfile_plain $SRCDIR/rvf/rvf_trace_adapt.c
-cfile_plain $SRCDIR/rvt/ti_profiler/ti_profiler.c
-cfile_plain $SRCDIR/rvt/ti_profiler/ti_profiler_env.c
+c_file $SRCDIR/rvf/rvf_buffer.c
+c_file $SRCDIR/rvf/rvf_msg.c
+c_file $SRCDIR/rvf/rvf_task.c
+c_file $SRCDIR/rvf/rvf_time.c
+c_file $SRCDIR/rvm/rvm_api.c
+c_file $SRCDIR/rvm/rvm_group_swe.c
+c_file $SRCDIR/rvm/rvm_mem.c
+c_file $SRCDIR/rvm/rvm_swe_db.c
+c_file $SRCDIR/rvm/rvm_swe_hdlr.c
+c_file $SRCDIR/rvm/rvm_task.c
+c_file $SRCDIR/support/exception.c
+c_file $SRCDIR/rvf/rvf_trace_adapt.c
+c_file $SRCDIR/rvt/ti_profiler/ti_profiler.c
+c_file $SRCDIR/rvt/ti_profiler/ti_profiler_env.c
--- a/components/riviera_cust_flash	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/riviera_cust_flash	Sun Jul 15 22:53:50 2018 +0000
@@ -21,8 +21,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -48,9 +48,9 @@
 
 SRCDIR=$SRC/cs/riviera
 
-cfile_plain $SRCDIR/rvf/rvf_mem_pool.c
-cfile_plain $SRCDIR/rvm/rvm_swe.c
-cfile_plain $SRCDIR/rvt/rvt_api.c
-cfile_plain $SRCDIR/rvt/rvt_env.c
-cfile_plain $SRCDIR/rvt/rvt_task.c
-cfile_plain $SRCDIR/rvt/rvt_keepalive.c
+c_file $SRCDIR/rvf/rvf_mem_pool.c
+c_file $SRCDIR/rvm/rvm_swe.c
+c_file $SRCDIR/rvt/rvt_api.c
+c_file $SRCDIR/rvt/rvt_env.c
+c_file $SRCDIR/rvt/rvt_task.c
+c_file $SRCDIR/rvt/rvt_keepalive.c
--- a/components/rlp	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/rlp	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version rlp
-cfile_plain rlp_version.c
+c_file rlp_version.c
 
 # Defines
 
@@ -59,27 +59,27 @@
 
 SRCDIR=$SRC/g23m-fad/rlp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/rlp_kerf.c
-cfile_str2ind $SRCDIR/rlp_kerp.c
-cfile_str2ind $SRCDIR/rlp_kers.c
-cfile_str2ind $SRCDIR/rlp_pei.c
-cfile_str2ind $SRCDIR/rlp_rbm.c
-cfile_str2ind $SRCDIR/rlp_rcvf.c
-cfile_str2ind $SRCDIR/rlp_rcvp.c
-cfile_str2ind $SRCDIR/rlp_rcvs.c
-cfile_str2ind $SRCDIR/rlp_sbm.c
-cfile_str2ind $SRCDIR/rlp_sndf.c
-cfile_str2ind $SRCDIR/rlp_sndp.c
-cfile_str2ind $SRCDIR/rlp_snds.c
-cfile_str2ind $SRCDIR/rlp_srm.c
-cfile_str2ind $SRCDIR/rlp_tim.c
+c_file $SRCDIR/rlp_kerf.c
+c_file $SRCDIR/rlp_kerp.c
+c_file $SRCDIR/rlp_kers.c
+c_file $SRCDIR/rlp_pei.c
+c_file $SRCDIR/rlp_rbm.c
+c_file $SRCDIR/rlp_rcvf.c
+c_file $SRCDIR/rlp_rcvp.c
+c_file $SRCDIR/rlp_rcvs.c
+c_file $SRCDIR/rlp_sbm.c
+c_file $SRCDIR/rlp_sndf.c
+c_file $SRCDIR/rlp_sndp.c
+c_file $SRCDIR/rlp_snds.c
+c_file $SRCDIR/rlp_srm.c
+c_file $SRCDIR/rlp_tim.c
--- a/components/rr	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/rr	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version rr
-cfile_plain rr_version.c
+c_file rr_version.c
 
 # Defines
 
@@ -62,11 +62,11 @@
 
 SRCDIR=$SRC/g23m-gsm/rr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
@@ -93,26 +93,26 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/rr_attf.c
-cfile_str2ind $SRCDIR/rr_attp.c
-cfile_str2ind $SRCDIR/rr_atts.c
-cfile_str2ind $SRCDIR/rr_datf.c
-cfile_str2ind $SRCDIR/rr_datp.c
-cfile_str2ind $SRCDIR/rr_dats.c
-cfile_str2ind $SRCDIR/rr_forf.c
-cfile_str2ind $SRCDIR/rr_forp.c
-cfile_str2ind $SRCDIR/rr_fors.c
-cfile_str2ind $SRCDIR/rr_csf.c
-cfile_str2ind $SRCDIR/rr_pei.c
-cfile_str2ind $SRCDIR/rr_srv.c
-cfile_str2ind $SRCDIR/rr_tim.c
-cfile_str2ind $SRCDIR/rr_cs.c
+c_file $SRCDIR/rr_attf.c
+c_file $SRCDIR/rr_attp.c
+c_file $SRCDIR/rr_atts.c
+c_file $SRCDIR/rr_datf.c
+c_file $SRCDIR/rr_datp.c
+c_file $SRCDIR/rr_dats.c
+c_file $SRCDIR/rr_forf.c
+c_file $SRCDIR/rr_forp.c
+c_file $SRCDIR/rr_fors.c
+c_file $SRCDIR/rr_csf.c
+c_file $SRCDIR/rr_pei.c
+c_file $SRCDIR/rr_srv.c
+c_file $SRCDIR/rr_tim.c
+c_file $SRCDIR/rr_cs.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/rr_gprs.c
-	cfile_str2ind $SRCDIR/rr_datg.c
-	cfile_str2ind $SRCDIR/rr_attg.c
+	c_file $SRCDIR/rr_gprs.c
+	c_file $SRCDIR/rr_datg.c
+	c_file $SRCDIR/rr_attg.c
 fi
 
-cfile_str2ind $SRCDIR/rr_em.c
+c_file $SRCDIR/rr_em.c
--- a/components/rtc_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/rtc_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,8 +35,8 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/rtc
 
-cfile_plain $SRCDIR/rtc_process.c
-cfile_plain $SRCDIR/rtc_env.c
-cfile_plain $SRCDIR/rtc_task.c
-cfile_plain $SRCDIR/rtc_handle_message.c
-cfile_plain $SRCDIR/board/rtc_functions.c
+c_file $SRCDIR/rtc_process.c
+c_file $SRCDIR/rtc_env.c
+c_file $SRCDIR/rtc_task.c
+c_file $SRCDIR/rtc_handle_message.c
+c_file $SRCDIR/board/rtc_functions.c
--- a/components/sim_b_lib	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sim_b_lib	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version sim
-cfile_plain sim_version.c
+c_file sim_version.c
 
 # Defines
 
@@ -70,24 +70,24 @@
 
 SRCDIR=$SRC/g23m-gsm/sim
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/sim_app.c
-cfile_str2ind $SRCDIR/sim_fkt.c
-cfile_str2ind $SRCDIR/sim_pei.c
-cfile_str2ind $SRCDIR/sim_stk.c
+c_file $SRCDIR/sim_app.c
+c_file $SRCDIR/sim_fkt.c
+c_file $SRCDIR/sim_pei.c
+c_file $SRCDIR/sim_stk.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/sim_gprs.c
+	c_file $SRCDIR/sim_gprs.c
 fi
 
-cfile_str2ind $SRCDIR/sim_em.c
+c_file $SRCDIR/sim_em.c
--- a/components/sim_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sim_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -13,8 +13,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -44,7 +44,7 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/tm_cust0"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/dyn_dwl_include"
 
-cfile_plain $SRCDIR/sim.c
+c_file $SRCDIR/sim.c
 
 # CFLAGS and CPPFLAGS for sim32.c
 
@@ -57,8 +57,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -79,4 +79,4 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/ulpd"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
 
-cfile_plain $SRCDIR/sim32.c
+c_file $SRCDIR/sim32.c
--- a/components/sm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sm	Sun Jul 15 22:53:50 2018 +0000
@@ -54,31 +54,31 @@
 
 SRCDIR=$SRC/g23m-gprs/sm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/sm.c
-cfile_str2ind $SRCDIR/sm_aci_output_handler.c
-cfile_str2ind $SRCDIR/sm_context_control.c
-cfile_str2ind $SRCDIR/sm_context_deactivate_control.c
-cfile_str2ind $SRCDIR/sm_debug.c
-cfile_str2ind $SRCDIR/sm_dispatch_message.c
-cfile_str2ind $SRCDIR/sm_dispatcher.c
-cfile_str2ind $SRCDIR/sm_memory_handler.c
-cfile_str2ind $SRCDIR/sm_mm_output_handler.c
-cfile_str2ind $SRCDIR/sm_network_control.c
-cfile_str2ind $SRCDIR/sm_pei.c
-cfile_str2ind $SRCDIR/sm_qos.c
-cfile_str2ind $SRCDIR/sm_sequencer.c
-cfile_str2ind $SRCDIR/sm_tft.c
-cfile_str2ind $SRCDIR/sm_timer_handler.c
-cfile_str2ind $SRCDIR/sm_upm_output_handler.c
-cfile_str2ind $SRCDIR/sm_user_plane_control.c
+c_file $SRCDIR/sm.c
+c_file $SRCDIR/sm_aci_output_handler.c
+c_file $SRCDIR/sm_context_control.c
+c_file $SRCDIR/sm_context_deactivate_control.c
+c_file $SRCDIR/sm_debug.c
+c_file $SRCDIR/sm_dispatch_message.c
+c_file $SRCDIR/sm_dispatcher.c
+c_file $SRCDIR/sm_memory_handler.c
+c_file $SRCDIR/sm_mm_output_handler.c
+c_file $SRCDIR/sm_network_control.c
+c_file $SRCDIR/sm_pei.c
+c_file $SRCDIR/sm_qos.c
+c_file $SRCDIR/sm_sequencer.c
+c_file $SRCDIR/sm_tft.c
+c_file $SRCDIR/sm_timer_handler.c
+c_file $SRCDIR/sm_upm_output_handler.c
+c_file $SRCDIR/sm_user_plane_control.c
--- a/components/sms	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sms	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version sms
-cfile_plain sms_version.c
+c_file sms_version.c
 
 # Defines
 
@@ -49,23 +49,23 @@
 
 SRCDIR=$SRC/g23m-gsm/sms
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/sms_cp.c
-cfile_str2ind $SRCDIR/sms_csf.c
-cfile_str2ind $SRCDIR/sms_for.c
-cfile_str2ind $SRCDIR/sms_pei.c
-cfile_str2ind $SRCDIR/sms_rl.c
-cfile_str2ind $SRCDIR/sms_time.c
-cfile_str2ind $SRCDIR/sms_tlf.c
-cfile_str2ind $SRCDIR/sms_tlp.c
-cfile_str2ind $SRCDIR/sms_tls.c
-cfile_str2ind $SRCDIR/sms_em.c
+c_file $SRCDIR/sms_cp.c
+c_file $SRCDIR/sms_csf.c
+c_file $SRCDIR/sms_for.c
+c_file $SRCDIR/sms_pei.c
+c_file $SRCDIR/sms_rl.c
+c_file $SRCDIR/sms_time.c
+c_file $SRCDIR/sms_tlf.c
+c_file $SRCDIR/sms_tlp.c
+c_file $SRCDIR/sms_tls.c
+c_file $SRCDIR/sms_em.c
--- a/components/sndcp	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sndcp	Sun Jul 15 22:53:50 2018 +0000
@@ -54,11 +54,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/dti"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/sndcp"
 CPPFLAGS="$CPPFLAGS -I.."
@@ -68,35 +68,35 @@
 
 SRCDIR=$SRC/g23m-gprs/sndcp
 
-cfile_str2ind $SRCDIR/sndcp_f.c
-cfile_str2ind $SRCDIR/sndcp_mgf.c
-cfile_str2ind $SRCDIR/sndcp_mgp.c
-cfile_str2ind $SRCDIR/sndcp_mgs.c
-cfile_str2ind $SRCDIR/sndcp_ndf.c
-cfile_str2ind $SRCDIR/sndcp_ndp.c
-cfile_str2ind $SRCDIR/sndcp_nds.c
-cfile_str2ind $SRCDIR/sndcp_nuf.c
-cfile_str2ind $SRCDIR/sndcp_nup.c
-cfile_str2ind $SRCDIR/sndcp_nus.c
-cfile_str2ind $SRCDIR/sndcp_pdaf.c
-cfile_str2ind $SRCDIR/sndcp_pdap.c
-cfile_str2ind $SRCDIR/sndcp_pdas.c
-cfile_str2ind $SRCDIR/sndcp_pdf.c
-cfile_str2ind $SRCDIR/sndcp_pdp.c
-cfile_str2ind $SRCDIR/sndcp_pds.c
-cfile_str2ind $SRCDIR/sndcp_pei.c
-cfile_str2ind $SRCDIR/sndcp_sdaf.c
-cfile_str2ind $SRCDIR/sndcp_sdap.c
-cfile_str2ind $SRCDIR/sndcp_sdas.c
-cfile_str2ind $SRCDIR/sndcp_sdf.c
-cfile_str2ind $SRCDIR/sndcp_sdp.c
-cfile_str2ind $SRCDIR/sndcp_sds.c
-cfile_str2ind $SRCDIR/sndcp_suaf.c
-cfile_str2ind $SRCDIR/sndcp_suap.c
-cfile_str2ind $SRCDIR/sndcp_suas.c
-cfile_str2ind $SRCDIR/sndcp_suf.c
-cfile_str2ind $SRCDIR/sndcp_sup.c
-cfile_str2ind $SRCDIR/sndcp_ciap.c
-cfile_str2ind $SRCDIR/sndcp_ciaf.c
-cfile_str2ind $SRCDIR/sndcp_cias.c
-cfile_str2ind $SRCDIR/sndcp_sus.c
+c_file $SRCDIR/sndcp_f.c
+c_file $SRCDIR/sndcp_mgf.c
+c_file $SRCDIR/sndcp_mgp.c
+c_file $SRCDIR/sndcp_mgs.c
+c_file $SRCDIR/sndcp_ndf.c
+c_file $SRCDIR/sndcp_ndp.c
+c_file $SRCDIR/sndcp_nds.c
+c_file $SRCDIR/sndcp_nuf.c
+c_file $SRCDIR/sndcp_nup.c
+c_file $SRCDIR/sndcp_nus.c
+c_file $SRCDIR/sndcp_pdaf.c
+c_file $SRCDIR/sndcp_pdap.c
+c_file $SRCDIR/sndcp_pdas.c
+c_file $SRCDIR/sndcp_pdf.c
+c_file $SRCDIR/sndcp_pdp.c
+c_file $SRCDIR/sndcp_pds.c
+c_file $SRCDIR/sndcp_pei.c
+c_file $SRCDIR/sndcp_sdaf.c
+c_file $SRCDIR/sndcp_sdap.c
+c_file $SRCDIR/sndcp_sdas.c
+c_file $SRCDIR/sndcp_sdf.c
+c_file $SRCDIR/sndcp_sdp.c
+c_file $SRCDIR/sndcp_sds.c
+c_file $SRCDIR/sndcp_suaf.c
+c_file $SRCDIR/sndcp_suap.c
+c_file $SRCDIR/sndcp_suas.c
+c_file $SRCDIR/sndcp_suf.c
+c_file $SRCDIR/sndcp_sup.c
+c_file $SRCDIR/sndcp_ciap.c
+c_file $SRCDIR/sndcp_ciaf.c
+c_file $SRCDIR/sndcp_cias.c
+c_file $SRCDIR/sndcp_sus.c
--- a/components/spi_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/spi_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -35,7 +35,7 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/spi
 
-cfile_plain $SRCDIR/spi_process.c
-cfile_plain $SRCDIR/spi_api.c
-cfile_plain $SRCDIR/spi_env.c
-cfile_plain $SRCDIR/spi_task.c
+c_file $SRCDIR/spi_process.c
+c_file $SRCDIR/spi_api.c
+c_file $SRCDIR/spi_env.c
+c_file $SRCDIR/spi_task.c
--- a/components/ss	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ss	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version ss
-cfile_plain ss_version.c
+c_file ss_version.c
 
 # Defines
 
@@ -48,18 +48,18 @@
 
 SRCDIR=$SRC/g23m-gsm/ss
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/ss_csf.c
-cfile_str2ind $SRCDIR/ss_for.c
-cfile_str2ind $SRCDIR/ss_pei.c
-cfile_str2ind $SRCDIR/ss_ss.c
-cfile_str2ind $SRCDIR/ss_em.c
+c_file $SRCDIR/ss_csf.c
+c_file $SRCDIR/ss_for.c
+c_file $SRCDIR/ss_pei.c
+c_file $SRCDIR/ss_ss.c
+c_file $SRCDIR/ss_em.c
--- a/components/t30	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/t30	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version t30
-cfile_plain t30_version.c
+c_file t30_version.c
 
 # Defines
 
@@ -55,23 +55,23 @@
 
 SRCDIR=$SRC/g23m-fad/t30
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/t30_bcsf.c
-cfile_str2ind $SRCDIR/t30_bcss.c
-cfile_str2ind $SRCDIR/t30_kerf.c
-cfile_str2ind $SRCDIR/t30_kerp.c
-cfile_str2ind $SRCDIR/t30_kers.c
-cfile_str2ind $SRCDIR/t30_msgs.c
-cfile_str2ind $SRCDIR/t30_muxp.c
-cfile_str2ind $SRCDIR/t30_muxs.c
-cfile_str2ind $SRCDIR/t30_pei.c
-cfile_str2ind $SRCDIR/t30_tim.c
+c_file $SRCDIR/t30_bcsf.c
+c_file $SRCDIR/t30_bcss.c
+c_file $SRCDIR/t30_kerf.c
+c_file $SRCDIR/t30_kerp.c
+c_file $SRCDIR/t30_kers.c
+c_file $SRCDIR/t30_msgs.c
+c_file $SRCDIR/t30_muxp.c
+c_file $SRCDIR/t30_muxs.c
+c_file $SRCDIR/t30_pei.c
+c_file $SRCDIR/t30_tim.c
--- a/components/tif_na7_db_fl	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/tif_na7_db_fl	Sun Jul 15 22:53:50 2018 +0000
@@ -9,11 +9,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -30,10 +30,10 @@
 
 SRCDIR=$SRC/gpf2/tst
 
-cfile_plain $SRCDIR/drv/tr2.c
-cfile_plain $SRCDIR/drv/tif2.c
-cfile_plain $SRCDIR/drv/ser_tr.c
-cfile_plain $SRCDIR/drv/titrc.c
-cfile_plain $SRCDIR/tst_pei.c
-cfile_plain $SRCDIR/tstdriver.c
-cfile_plain $SRCDIR/tif_version.c
+c_file $SRCDIR/drv/tr2.c
+c_file $SRCDIR/drv/tif2.c
+c_file $SRCDIR/drv/ser_tr.c
+c_file $SRCDIR/drv/titrc.c
+c_file $SRCDIR/tst_pei.c
+c_file $SRCDIR/tstdriver.c
+c_file $SRCDIR/tif_version.c
--- a/components/tif_na7_db_ir	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/tif_na7_db_ir	Sun Jul 15 22:53:50 2018 +0000
@@ -9,11 +9,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -30,10 +30,10 @@
 
 SRCDIR=$SRC/gpf2/tst
 
-cfile_plain $SRCDIR/drv/tr2.c
-cfile_plain $SRCDIR/drv/tif2.c
-cfile_plain $SRCDIR/drv/ser_tr.c
-cfile_plain $SRCDIR/drv/titrc.c
-cfile_plain $SRCDIR/tst_pei.c
-cfile_plain $SRCDIR/tstdriver.c
-cfile_plain $SRCDIR/tif_version.c
+c_file $SRCDIR/drv/tr2.c
+c_file $SRCDIR/drv/tif2.c
+c_file $SRCDIR/drv/ser_tr.c
+c_file $SRCDIR/drv/titrc.c
+c_file $SRCDIR/tst_pei.c
+c_file $SRCDIR/tstdriver.c
+c_file $SRCDIR/tif_version.c
--- a/components/tpudrv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/tpudrv	Sun Jul 15 22:53:50 2018 +0000
@@ -42,10 +42,10 @@
 
 SRCDIR=$SRC/cs/layer1/tpu_drivers
 
-cfile_plain $SRCDIR/source/tpudrv.c
-cfile_plain $SRCDIR/source0/tpudrv${RF}.c
+c_file $SRCDIR/source/tpudrv.c
+c_file $SRCDIR/source0/tpudrv${RF}.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_plain $SRCDIR/p_source0/p_tpudr${RF}.c
+	c_file $SRCDIR/p_source0/p_tpudr${RF}.c
 fi
--- a/components/uart_b_lib	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/uart_b_lib	Sun Jul 15 22:53:50 2018 +0000
@@ -60,11 +60,11 @@
 
 SRCDIR=$SRC/g23m-aci/uart
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/cust0"
 CPPFLAGS="$CPPFLAGS -I.."
@@ -92,22 +92,22 @@
 
 # Source modules
 
-cfile_str2ind $SRCDIR/uart_kerf.c
-cfile_str2ind $SRCDIR/uart_kerp.c
-cfile_str2ind $SRCDIR/uart_kers.c
-cfile_str2ind $SRCDIR/uart_drxf.c
-cfile_str2ind $SRCDIR/uart_drxp.c
-cfile_str2ind $SRCDIR/uart_drxs.c
-cfile_str2ind $SRCDIR/uart_dtxf.c
-cfile_str2ind $SRCDIR/uart_dtxp.c
-cfile_str2ind $SRCDIR/uart_dtxs.c
-cfile_str2ind $SRCDIR/uart_rxf.c
-cfile_str2ind $SRCDIR/uart_rxp.c
-cfile_str2ind $SRCDIR/uart_rxs.c
-cfile_str2ind $SRCDIR/uart_txf.c
-cfile_str2ind $SRCDIR/uart_txp.c
-cfile_str2ind $SRCDIR/uart_txs.c
-cfile_str2ind $SRCDIR/uart_rtf.c
-cfile_str2ind $SRCDIR/uart_rtp.c
-cfile_str2ind $SRCDIR/uart_rts.c
-cfile_str2ind $SRCDIR/uart_pei.c
+c_file $SRCDIR/uart_kerf.c
+c_file $SRCDIR/uart_kerp.c
+c_file $SRCDIR/uart_kers.c
+c_file $SRCDIR/uart_drxf.c
+c_file $SRCDIR/uart_drxp.c
+c_file $SRCDIR/uart_drxs.c
+c_file $SRCDIR/uart_dtxf.c
+c_file $SRCDIR/uart_dtxp.c
+c_file $SRCDIR/uart_dtxs.c
+c_file $SRCDIR/uart_rxf.c
+c_file $SRCDIR/uart_rxp.c
+c_file $SRCDIR/uart_rxs.c
+c_file $SRCDIR/uart_txf.c
+c_file $SRCDIR/uart_txp.c
+c_file $SRCDIR/uart_txs.c
+c_file $SRCDIR/uart_rtf.c
+c_file $SRCDIR/uart_rtp.c
+c_file $SRCDIR/uart_rts.c
+c_file $SRCDIR/uart_pei.c
--- a/components/uart_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/uart_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -14,8 +14,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -40,5 +40,5 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/uart
 
-cfile_plain $SRCDIR/serialswitch.c
-cfile_plain $SRCDIR/uartfax.c
+c_file $SRCDIR/serialswitch.c
+c_file $SRCDIR/uartfax.c
--- a/components/upm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/upm	Sun Jul 15 22:53:50 2018 +0000
@@ -55,24 +55,24 @@
 
 SRCDIR=$SRC/g23m-gprs/upm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/upm.c
-cfile_str2ind $SRCDIR/upm_aci_output_handler.c
-cfile_str2ind $SRCDIR/upm_dispatcher.c
-cfile_str2ind $SRCDIR/upm_dispatcher_gsm.c
-cfile_str2ind $SRCDIR/upm_link_control.c
-cfile_str2ind $SRCDIR/upm_mm_output_handler.c
-cfile_str2ind $SRCDIR/upm_pei.c
-cfile_str2ind $SRCDIR/upm_sm_output_handler.c
-cfile_str2ind $SRCDIR/upm_sndcp_control.c
-cfile_str2ind $SRCDIR/upm_sndcp_output_handler.c
+c_file $SRCDIR/upm.c
+c_file $SRCDIR/upm_aci_output_handler.c
+c_file $SRCDIR/upm_dispatcher.c
+c_file $SRCDIR/upm_dispatcher_gsm.c
+c_file $SRCDIR/upm_link_control.c
+c_file $SRCDIR/upm_mm_output_handler.c
+c_file $SRCDIR/upm_pei.c
+c_file $SRCDIR/upm_sm_output_handler.c
+c_file $SRCDIR/upm_sndcp_control.c
+c_file $SRCDIR/upm_sndcp_output_handler.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/convert-from-magnetite.ex	Sun Jul 15 22:53:50 2018 +0000
@@ -0,0 +1,10 @@
+1,$s/$CONDAT/condat/
+1,$s/$GPF/gpf/
+1,$s/$CDGINC/cdg-hybrid\/cdginc/
+1,$s/$CDGPRIM/cdg-hybrid\/sap-inline/
+1,$s/$ACI/g23m-aci/
+
+1,$s/cfile_plain/c_file/
+1,$s/cfile_str2ind/c_file/
+
+w