From 0b753f3e3377d0cd0c8ad857602e4ada4894dc98 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 19 Sep 2012 09:19:23 +0000 Subject: [PATCH] eeze: Introduce modules directory and place eeze_sensor modules into it. More like other efl libs and maybe we have more modules for eeze later on. SVN revision: 76847 --- legacy/eeze/configure.ac | 1 + legacy/eeze/src/Makefile.am | 2 +- legacy/eeze/src/lib/Makefile.am | 15 ----------- legacy/eeze/src/modules/Makefile.am | 26 +++++++++++++++++++ .../src/{lib => modules}/eeze_sensor_fake.c | 0 .../src/{lib => modules}/eeze_sensor_tizen.c | 0 6 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 legacy/eeze/src/modules/Makefile.am rename legacy/eeze/src/{lib => modules}/eeze_sensor_fake.c (100%) rename legacy/eeze/src/{lib => modules}/eeze_sensor_tizen.c (100%) diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index d9b7726589..90da70fadc 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -265,6 +265,7 @@ src/Makefile src/lib/Makefile src/bin/Makefile src/tests/Makefile +src/modules/Makefile eeze.pc eeze.spec ]) diff --git a/legacy/eeze/src/Makefile.am b/legacy/eeze/src/Makefile.am index f918327e28..f8338e16db 100644 --- a/legacy/eeze/src/Makefile.am +++ b/legacy/eeze/src/Makefile.am @@ -1,2 +1,2 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = lib bin tests +SUBDIRS = lib bin tests modules diff --git a/legacy/eeze/src/lib/Makefile.am b/legacy/eeze/src/lib/Makefile.am index c946f3c79f..76d1f761d2 100644 --- a/legacy/eeze/src/lib/Makefile.am +++ b/legacy/eeze/src/lib/Makefile.am @@ -45,18 +45,3 @@ endif libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ -# Sensor modules -pkgdir = $(libdir)/eeze-sensor -if HAVE_EEZE_TIZEN -pkg_LTLIBRARIES = eeze-sensor-tizen.la -eeze_sensor_tizen_la_SOURCES = eeze_sensor_tizen.c -eeze_sensor_tizen_la_LDFLAGS = -no-undefined -module -avoid-version @TIZEN_SENSOR_LIBS@ -eeze_sensor_tizen_la_LIBTOOLFLAGS = --tag=disable-static -else -pkg_LTLIBRARIES = eeze-sensor-fake.la -eeze_sensor_fake_la_SOURCES = eeze_sensor_fake.c -eeze_sensor_fake_la_LDFLAGS = -no-undefined -module -avoid-version -eeze_sensor_fake_la_LIBTOOLFLAGS = --tag=disable-static -endif - - diff --git a/legacy/eeze/src/modules/Makefile.am b/legacy/eeze/src/modules/Makefile.am new file mode 100644 index 0000000000..afa2d5b78d --- /dev/null +++ b/legacy/eeze/src/modules/Makefile.am @@ -0,0 +1,26 @@ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = @EEZE_CFLAGS@ \ +-I$(top_srcdir) \ +-I$(top_srcdir)/src/lib \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" + +AM_CFLAGS = @EEZE_CFLAGS@ + +includesdir = $(includedir)/eeze-@VMAJ@ + +# Sensor modules +pkgdir = $(libdir)/eeze-sensor +if HAVE_EEZE_TIZEN +pkg_LTLIBRARIES = eeze-sensor-tizen.la +eeze_sensor_tizen_la_SOURCES = eeze_sensor_tizen.c +eeze_sensor_tizen_la_LDFLAGS = -no-undefined -module -avoid-version @TIZEN_SENSOR_LIBS@ +eeze_sensor_tizen_la_LIBTOOLFLAGS = --tag=disable-static +else +pkg_LTLIBRARIES = eeze-sensor-fake.la +eeze_sensor_fake_la_SOURCES = eeze_sensor_fake.c +eeze_sensor_fake_la_LDFLAGS = -no-undefined -module -avoid-version +eeze_sensor_fake_la_LIBTOOLFLAGS = --tag=disable-static +endif + + diff --git a/legacy/eeze/src/lib/eeze_sensor_fake.c b/legacy/eeze/src/modules/eeze_sensor_fake.c similarity index 100% rename from legacy/eeze/src/lib/eeze_sensor_fake.c rename to legacy/eeze/src/modules/eeze_sensor_fake.c diff --git a/legacy/eeze/src/lib/eeze_sensor_tizen.c b/legacy/eeze/src/modules/eeze_sensor_tizen.c similarity index 100% rename from legacy/eeze/src/lib/eeze_sensor_tizen.c rename to legacy/eeze/src/modules/eeze_sensor_tizen.c