move sg_sat_phy_event to src directory (main collection) and enhance; leave original in examples directory renamed to sg__sat_phy_event

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@120 6180dd3e-e324-4e3e-922d-17de1ae2f315

6 files changed, 19 insertions, 23 deletions

diff --git a/examples/Makefile b/examples/Makefile
index feea3da7..98d0b638 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -9,8 +9,8 @@ LD = gcc
 
 EXECS = sg_simple1 sg_simple2 sg_simple3 sg_simple4 sg_simple16 \
 	sg_iovec_tst scsi_inquiry sg_excl sg_sense_test sg_simple5 \
-	sg__sat_identify sg__sat_set_features sg_sat_chk_power \
-	sg_sat_smart_rd_data sg_sat_phy_event
+	sg__sat_identify sg__sat_phy_event sg__sat_set_features \
+	sg_sat_chk_power sg_sat_smart_rd_data
 
 # EXECS = sg_simple1 sg_simple2 sg_simple3 sg_simple4 sg_simple16 \
 # 	  sg_simple_aio sg_iovec_tst scsi_inquiry sg_excl
@@ -20,9 +20,9 @@ MAN_PREF = man8
 
 LARGE_FILE_FLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
-CFLAGS = -g -O2 -W -Wall -D_REENTRANT $(LARGE_FILE_FLAGS)
-# CFLAGS = -g -O2 -Wall -D_REENTRANT -DSG_KERNEL_INCLUDES $(LARGE_FILE_FLAGS)
-# CFLAGS = -g -O2 -Wall -pedantic -D_REENTRANT $(LARGE_FILE_FLAGS)
+CFLAGS = -g -O2 -W -Wall -I../include -D_REENTRANT $(LARGE_FILE_FLAGS)
+# CFLAGS = -g -O2 -Wall -I../include -D_REENTRANT -DSG_KERNEL_INCLUDES $(LARGE_FILE_FLAGS)
+# CFLAGS = -g -O2 -Wall -pedantic -I../include -D_REENTRANT $(LARGE_FILE_FLAGS)
 
 LDFLAGS =
 
@@ -35,52 +35,52 @@ depend dep:
 clean:
 	/bin/rm -f *.o $(EXECS) core .depend
 
-sg_simple1: sg_simple1.o ../sg_lib.o ../sg_io_linux.o
+sg_simple1: sg_simple1.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
 sg_simple2: sg_simple2.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_simple3: sg_simple3.o ../sg_lib.o ../sg_io_linux.o
+sg_simple3: sg_simple3.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_simple4: sg_simple4.o ../sg_lib.o ../sg_io_linux.o
+sg_simple4: sg_simple4.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_simple16: sg_simple16.o ../sg_lib.o ../sg_io_linux.o
+sg_simple16: sg_simple16.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_simple_aio: sg_simple_aio.o ../sg_lib.o ../sg_io_linux.o
+sg_simple_aio: sg_simple_aio.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^ -l aio
 
-sg_iovec_tst: sg_iovec_tst.o ../sg_lib.o ../sg_io_linux.o
+sg_iovec_tst: sg_iovec_tst.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
 scsi_inquiry: scsi_inquiry.o
 	$(LD) -o $@ $(LDFLAGS) $^ 
 
-sg_excl: sg_excl.o ../sg_lib.o ../sg_io_linux.o
+sg_excl: sg_excl.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_sense_test: sg_sense_test.o ../sg_lib.o ../sg_io_linux.o
+sg_sense_test: sg_sense_test.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_simple5: sg_simple5.o ../sg_lib.o ../sg_pt_linux.o
+sg_simple5: sg_simple5.o ../lib/sg_lib.o ../lib/sg_pt_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg__sat_identify: sg__sat_identify.o ../sg_lib.o ../sg_io_linux.o
+sg__sat_identify: sg__sat_identify.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg__sat_set_features: sg__sat_set_features.o ../sg_lib.o ../sg_io_linux.o
+sg__sat_phy_event: sg__sat_phy_event.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_sat_chk_power: sg_sat_chk_power.o ../sg_lib.o ../sg_io_linux.o
+sg__sat_set_features: sg__sat_set_features.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_sat_smart_rd_data: sg_sat_smart_rd_data.o ../sg_lib.o ../sg_io_linux.o
+sg_sat_chk_power: sg_sat_chk_power.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
-sg_sat_phy_event: sg_sat_phy_event.o ../sg_lib.o ../sg_io_linux.o
+sg_sat_smart_rd_data: sg_sat_smart_rd_data.o ../lib/sg_lib.o ../src/sg_io_linux.o
 	$(LD) -o $@ $(LDFLAGS) $^
 
 install: $(EXECS)
diff --git a/examples/sg_sat_phy_event.c b/examples/sg__sat_phy_event.c
index a2922857..a2922857 100644
--- a/examples/sg_sat_phy_event.c
+++ b/examples/sg__sat_phy_event.c
diff --git a/examples/sg_io_linux.h b/examples/sg_io_linux.h
deleted file mode 100644
index 459a7cd9..00000000
--- a/examples/sg_io_linux.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../sg_io_linux.h"
diff --git a/examples/sg_lib.h b/examples/sg_lib.h
deleted file mode 100644
index e2f826a1..00000000
--- a/examples/sg_lib.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../sg_lib.h"
diff --git a/examples/sg_linux_inc.h b/examples/sg_linux_inc.h
deleted file mode 100644
index a5bf738d..00000000
--- a/examples/sg_linux_inc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../sg_linux_inc.h"
diff --git a/examples/sg_pt.h b/examples/sg_pt.h
deleted file mode 100644
index 2be7b43b..00000000
--- a/examples/sg_pt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../sg_pt.h"