eeze: move binaries into subdirectories

in order to move to cmake we are moving every binary into its own
subdirectory.

diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 5a025ad..9f86fa1 100644 (file)
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -11,7 +11,7 @@ lib/eeze/Eeze.h \
 lib/eeze/Eeze_Net.h \
 lib/eeze/Eeze_Sensor.h \
 lib/eeze/Eeze_Disk.h \
-bin/eeze/eeze_scanner.h
+bin/eeze/eeze_scanner/eeze_scanner.h
 
 # libeeze.la
 lib_eeze_libeeze_la_SOURCES = \
@@ -109,53 +109,53 @@ modules_eeze_sensor_udev_module_la_LIBTOOLFLAGS = --tag=disable-static
 ### Binary
 
 noinst_PROGRAMS += \
-bin/eeze/eeze_udev_test \
-bin/eeze/eeze_sensor_test
+bin/eeze/eeze_udev_test/eeze_udev_test \
+bin/eeze/eeze_sensor_test/eeze_sensor_test
 
-bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
-bin_eeze_eeze_udev_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+bin_eeze_eeze_udev_test_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test/eeze_udev_test.c
+bin_eeze_eeze_udev_test_eeze_udev_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_udev_test_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_udev_test_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
-bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
-bin_eeze_eeze_sensor_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+bin_eeze_eeze_sensor_test_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test/eeze_sensor_test.c
+bin_eeze_eeze_sensor_test_eeze_sensor_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_sensor_test_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_sensor_test_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 bin_PROGRAMS += \
-bin/eeze/eeze_mount \
-bin/eeze/eeze_umount \
-bin/eeze/eeze_disk_ls \
-bin/eeze/eeze_scanner \
-bin/eeze/eeze_scanner_monitor
-
-bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
-bin_eeze_eeze_mount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
-
-bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
-bin_eeze_eeze_umount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
-
-bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
-bin_eeze_eeze_disk_ls_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
-
-bin_eeze_eeze_scanner_SOURCES = \
-bin/eeze/eeze_scanner.c \
-bin/eeze/eeze_scanner.h
-bin_eeze_eeze_scanner_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
-
-bin_eeze_eeze_scanner_monitor_SOURCES = \
-bin/eeze/eeze_scanner_monitor.c
-bin_eeze_eeze_scanner_monitor_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
-bin_eeze_eeze_scanner_monitor_LDADD = @USE_EEZE_LIBS@
-bin_eeze_eeze_scanner_monitor_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+bin/eeze/eeze_mount/eeze_mount \
+bin/eeze/eeze_umount/eeze_umount \
+bin/eeze/eeze_disk_ls/eeze_disk_ls \
+bin/eeze/eeze_scanner/eeze_scanner \
+bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor
+
+bin_eeze_eeze_mount_eeze_mount_SOURCES = bin/eeze/eeze_mount/eeze_mount.c
+bin_eeze_eeze_mount_eeze_mount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_mount_eeze_mount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_mount_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_umount_eeze_umount_SOURCES = bin/eeze/eeze_umount/eeze_umount.c
+bin_eeze_eeze_umount_eeze_umount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_umount_eeze_umount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_umount_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_disk_ls_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls/eeze_disk_ls.c
+bin_eeze_eeze_disk_ls_eeze_disk_ls_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_disk_ls_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_disk_ls_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_scanner_eeze_scanner_SOURCES = \
+bin/eeze/eeze_scanner/eeze_scanner.c \
+bin/eeze/eeze_scanner/eeze_scanner.h
+bin_eeze_eeze_scanner_eeze_scanner_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_eeze_scanner_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_scanner_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_SOURCES = \
+bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 setuid_root_mode = a=rx,u+xs
 

diff --git a/src/bin/eeze/.gitignore b/src/bin/eeze/.gitignore
index 2cb6973..e88183f 100644 (file)
--- a/src/bin/eeze/.gitignore
+++ b/src/bin/eeze/.gitignore
@@ -1,7 +1,7 @@
-/eeze_disk_ls
-/eeze_mount
-/eeze_scanner
-/eeze_scanner_monitor
-/eeze_sensor_test
-/eeze_udev_test
-/eeze_umount
+eeze_disk_ls/eeze_disk_ls
+eeze_mount/eeze_mount
+eeze_scanner/eeze_scanner
+eeze_scanner_monitor/eeze_scanner_monitor
+eeze_sensor_test/eeze_sensor_test
+eeze_udev_test/eeze_udev_test
+eeze_umount/eeze_umount

diff --git a/src/bin/eeze/eeze_disk_ls.c b/src/bin/eeze/eeze_disk_ls/eeze_disk_ls.c
similarity index 100%
rename from src/bin/eeze/eeze_disk_ls.c
rename to src/bin/eeze/eeze_disk_ls/eeze_disk_ls.c

diff --git a/src/bin/eeze/eeze_mount.c b/src/bin/eeze/eeze_mount/eeze_mount.c
similarity index 100%
rename from src/bin/eeze/eeze_mount.c
rename to src/bin/eeze/eeze_mount/eeze_mount.c

diff --git a/src/bin/eeze/eeze_scanner.c b/src/bin/eeze/eeze_scanner/eeze_scanner.c
similarity index 100%
rename from src/bin/eeze/eeze_scanner.c
rename to src/bin/eeze/eeze_scanner/eeze_scanner.c

diff --git a/src/bin/eeze/eeze_scanner.h b/src/bin/eeze/eeze_scanner/eeze_scanner.h
similarity index 100%
rename from src/bin/eeze/eeze_scanner.h
rename to src/bin/eeze/eeze_scanner/eeze_scanner.h

diff --git a/src/bin/eeze/eeze_scanner_monitor.c b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
similarity index 99%
rename from src/bin/eeze/eeze_scanner_monitor.c
rename to src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
index fd01d2c..b6b8e14 100644 (file)
--- a/src/bin/eeze/eeze_scanner_monitor.c
+++ b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
@@ -7,7 +7,7 @@
 #include <Eet.h>
 #include <Ecore.h>
 #include <Ecore_Con.h>
-#include "eeze_scanner.h"
+#include "../eeze_scanner/eeze_scanner.h"
 
 static Eet_Data_Descriptor *edd;
 

diff --git a/src/bin/eeze/eeze_sensor_test.c b/src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c
similarity index 100%
rename from src/bin/eeze/eeze_sensor_test.c
rename to src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c

diff --git a/src/bin/eeze/eeze_udev_test.c b/src/bin/eeze/eeze_udev_test/eeze_udev_test.c
similarity index 100%
rename from src/bin/eeze/eeze_udev_test.c
rename to src/bin/eeze/eeze_udev_test/eeze_udev_test.c

diff --git a/src/bin/eeze/eeze_umount.c b/src/bin/eeze/eeze_umount/eeze_umount.c
similarity index 100%
rename from src/bin/eeze/eeze_umount.c
rename to src/bin/eeze/eeze_umount/eeze_umount.c