# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1531696575 0
# Node ID 0309400d714dbde7c728be0a33090911c1acdb0c
# Parent  db9c43a9e218663481906800e24219376b938832
components: gpf2/gpf3 paths changed to just gpf

diff -r db9c43a9e218 -r 0309400d714d components/ccd_na7_db
--- a/components/ccd_na7_db	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/ccd_na7_db	Sun Jul 15 23:16:15 2018 +0000
@@ -16,7 +16,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/ccd
+SRCDIR=$SRC/gpf/ccd
 
 c_file $SRCDIR/ccd.c
 c_file $SRCDIR/bitfun.c
diff -r db9c43a9e218 -r 0309400d714d components/ccddata
--- a/components/ccddata	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/ccddata	Sun Jul 15 23:16:15 2018 +0000
@@ -11,7 +11,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/ccd
+SRCDIR=$SRC/gpf/ccd
 
 c_file $SRCDIR/ccd_config.c
 c_file $SRCDIR/ccddata_mconst.c
diff -r db9c43a9e218 -r 0309400d714d components/frame_na7_db_fl
--- a/components/frame_na7_db_fl	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/frame_na7_db_fl	Sun Jul 15 23:16:15 2018 +0000
@@ -13,11 +13,11 @@
 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"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/frame
+SRCDIR=$SRC/gpf/frame
 
 c_file $SRCDIR/frame.c
 c_file $SRCDIR/vsi_sem.c
@@ -39,7 +39,7 @@
 # drop -o3
 CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
 
-SRCDIR=$SRC/gpf2/osl
+SRCDIR=$SRC/gpf/osl
 
 c_file $SRCDIR/os_com_fl.c
 c_file $SRCDIR/os_drv.c
diff -r db9c43a9e218 -r 0309400d714d components/frame_na7_db_ir
--- a/components/frame_na7_db_ir	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/frame_na7_db_ir	Sun Jul 15 23:16:15 2018 +0000
@@ -13,11 +13,11 @@
 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"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/frame
+SRCDIR=$SRC/gpf/frame
 
 c_file $SRCDIR/frame.c
 c_file $SRCDIR/vsi_sem.c
@@ -39,7 +39,7 @@
 # drop -o3
 CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
 
-SRCDIR=$SRC/gpf2/osl
+SRCDIR=$SRC/gpf/osl
 
 c_file $SRCDIR/os_com_ir.c
 c_file $SRCDIR/os_mem_ir.c
diff -r db9c43a9e218 -r 0309400d714d components/misc_na7_db_fl
--- a/components/misc_na7_db_fl	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/misc_na7_db_fl	Sun Jul 15 23:16:15 2018 +0000
@@ -8,14 +8,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
 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
+SRCDIR=$SRC/gpf/misc
 
 c_file $SRCDIR/printtofile.c
 c_file $SRCDIR/tok.c
diff -r db9c43a9e218 -r 0309400d714d components/misc_na7_db_ir
--- a/components/misc_na7_db_ir	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/misc_na7_db_ir	Sun Jul 15 23:16:15 2018 +0000
@@ -8,14 +8,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
 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
+SRCDIR=$SRC/gpf/misc
 
 c_file $SRCDIR/printtofile.c
 c_file $SRCDIR/tok.c
diff -r db9c43a9e218 -r 0309400d714d components/osx_na7_db
--- a/components/osx_na7_db	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/osx_na7_db	Sun Jul 15 23:16:15 2018 +0000
@@ -14,6 +14,6 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/frame/cust_os
+SRCDIR=$SRC/gpf/frame/cust_os
 
 c_file $SRCDIR/osx.c
diff -r db9c43a9e218 -r 0309400d714d components/tif_na7_db_fl
--- a/components/tif_na7_db_fl	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/tif_na7_db_fl	Sun Jul 15 23:16:15 2018 +0000
@@ -14,7 +14,7 @@
 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/gpf/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rvt"
@@ -28,7 +28,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/tst
+SRCDIR=$SRC/gpf/tst
 
 c_file $SRCDIR/drv/tr2.c
 c_file $SRCDIR/drv/tif2.c
diff -r db9c43a9e218 -r 0309400d714d components/tif_na7_db_ir
--- a/components/tif_na7_db_ir	Sun Jul 15 23:12:02 2018 +0000
+++ b/components/tif_na7_db_ir	Sun Jul 15 23:16:15 2018 +0000
@@ -14,7 +14,7 @@
 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/gpf/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rvt"
@@ -28,7 +28,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/tst
+SRCDIR=$SRC/gpf/tst
 
 c_file $SRCDIR/drv/tr2.c
 c_file $SRCDIR/drv/tif2.c