summaryrefslogtreecommitdiff
path: root/src/Makefile_Eeze.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 21:05:19 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 21:05:19 +0000
commitfadeb72831ec8a124d684dfd4e3af99277a17f95 (patch)
treeaa0fae86777c27c77d42bcc12135610a6074c543 /src/Makefile_Eeze.am
parent9463885e78118443a7d4637cf56be6bfd9aa46f0 (diff)
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 '')
-rw-r--r--src/Makefile_Eeze.am28
1 files changed, 11 insertions, 17 deletions
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 3c13c7a..f50ad88 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -9,31 +9,27 @@ installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
9dist_installed_eezemainheaders_DATA = \ 9dist_installed_eezemainheaders_DATA = \
10lib/eeze/Eeze.h \ 10lib/eeze/Eeze.h \
11lib/eeze/Eeze_Net.h \ 11lib/eeze/Eeze_Net.h \
12lib/eeze/Eeze_Sensor.h 12lib/eeze/Eeze_Sensor.h \
13lib/eeze/Eeze_Disk.h
13 14
14# libeeze.la 15# libeeze.la
15lib_eeze_libeeze_la_SOURCES = \ 16lib_eeze_libeeze_la_SOURCES = \
17lib/eeze/eeze_disk.c \
18lib/eeze/eeze_disk_libmount_new.c \
19lib/eeze/eeze_disk_mount.c \
20lib/eeze/eeze_disk_private.h \
21lib/eeze/eeze_disk_udev.c \
16lib/eeze/eeze_main.c \ 22lib/eeze/eeze_main.c \
17lib/eeze/eeze_net.c \ 23lib/eeze/eeze_net.c \
18lib/eeze/eeze_net_private.h \ 24lib/eeze/eeze_net_private.h \
25lib/eeze/eeze_sensor.c \
26lib/eeze/eeze_sensor_private.h \
19lib/eeze/eeze_udev_find.c \ 27lib/eeze/eeze_udev_find.c \
20lib/eeze/eeze_udev_private.h \
21lib/eeze/eeze_udev_private.c \ 28lib/eeze/eeze_udev_private.c \
29lib/eeze/eeze_udev_private.h \
22lib/eeze/eeze_udev_syspath.c \ 30lib/eeze/eeze_udev_syspath.c \
23lib/eeze/eeze_udev_walk.c \ 31lib/eeze/eeze_udev_walk.c \
24lib/eeze/eeze_udev_watch.c \ 32lib/eeze/eeze_udev_watch.c
25lib/eeze/eeze_sensor_private.h \
26lib/eeze/eeze_sensor.c
27
28if HAVE_EEZE_MOUNT
29dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h
30lib_eeze_libeeze_la_SOURCES += \
31lib/eeze/eeze_disk.c \
32lib/eeze/eeze_disk_udev.c \
33lib/eeze/eeze_disk_mount.c \
34lib/eeze/eeze_disk_private.h \
35lib/eeze/eeze_disk_libmount_new.c
36endif
37 33
38lib_eeze_libeeze_la_CPPFLAGS = \ 34lib_eeze_libeeze_la_CPPFLAGS = \
39-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 35-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -86,7 +82,6 @@ bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@
86bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@ 82bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
87bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 83bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
88 84
89if HAVE_EEZE_MOUNT
90bin_PROGRAMS += \ 85bin_PROGRAMS += \
91bin/eeze/eeze_mount \ 86bin/eeze/eeze_mount \
92bin/eeze/eeze_umount \ 87bin/eeze/eeze_umount \
@@ -114,7 +109,6 @@ bin/eeze/eeze_scanner.h
114bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@ 109bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
115bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@ 110bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
116bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 111bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
117endif
118 112
119setuid_root_mode = a=rx,u+xs 113setuid_root_mode = a=rx,u+xs
120install-data-hook:: 114install-data-hook::