diff options
| author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-16 21:05:19 +0000 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-16 21:05:19 +0000 |
| commit | fadeb72831ec8a124d684dfd4e3af99277a17f95 (patch) | |
| tree | aa0fae86777c27c77d42bcc12135610a6074c543 /src/Makefile_Eeze.am | |
| parent | 9463885e78118443a7d4637cf56be6bfd9aa46f0 (diff) | |
| download | efl-fadeb72831ec8a124d684dfd4e3af99277a17f95.tar.gz | |
eeze's mount shouldn't be optional.
eeze is just used on linux, where libmount exists and then we
shouldn't make this an option so we can rely on eeze's mount being
there.
(the code keeps the #ifdef's for a while, in case we need to revert that later)
SVN revision: 82901
Diffstat (limited to 'src/Makefile_Eeze.am')
| -rw-r--r-- | src/Makefile_Eeze.am | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am index 3c13c7abf4..f50ad88604 100644 --- a/src/Makefile_Eeze.am +++ b/src/Makefile_Eeze.am @@ -9,31 +9,27 @@ installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@ dist_installed_eezemainheaders_DATA = \ lib/eeze/Eeze.h \ lib/eeze/Eeze_Net.h \ -lib/eeze/Eeze_Sensor.h +lib/eeze/Eeze_Sensor.h \ +lib/eeze/Eeze_Disk.h # libeeze.la lib_eeze_libeeze_la_SOURCES = \ +lib/eeze/eeze_disk.c \ +lib/eeze/eeze_disk_libmount_new.c \ +lib/eeze/eeze_disk_mount.c \ +lib/eeze/eeze_disk_private.h \ +lib/eeze/eeze_disk_udev.c \ lib/eeze/eeze_main.c \ lib/eeze/eeze_net.c \ lib/eeze/eeze_net_private.h \ +lib/eeze/eeze_sensor.c \ +lib/eeze/eeze_sensor_private.h \ lib/eeze/eeze_udev_find.c \ -lib/eeze/eeze_udev_private.h \ lib/eeze/eeze_udev_private.c \ +lib/eeze/eeze_udev_private.h \ lib/eeze/eeze_udev_syspath.c \ lib/eeze/eeze_udev_walk.c \ -lib/eeze/eeze_udev_watch.c \ -lib/eeze/eeze_sensor_private.h \ -lib/eeze/eeze_sensor.c - -if HAVE_EEZE_MOUNT -dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h -lib_eeze_libeeze_la_SOURCES += \ -lib/eeze/eeze_disk.c \ -lib/eeze/eeze_disk_udev.c \ -lib/eeze/eeze_disk_mount.c \ -lib/eeze/eeze_disk_private.h \ -lib/eeze/eeze_disk_libmount_new.c -endif +lib/eeze/eeze_udev_watch.c lib_eeze_libeeze_la_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ @@ -86,7 +82,6 @@ bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@ bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@ bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ -if HAVE_EEZE_MOUNT bin_PROGRAMS += \ bin/eeze/eeze_mount \ bin/eeze/eeze_umount \ @@ -114,7 +109,6 @@ bin/eeze/eeze_scanner.h bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@ bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@ bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ -endif setuid_root_mode = a=rx,u+xs install-data-hook:: |