Only link tempget with needed libs.

SVN revision: 33542
This commit is contained in:
Sebastian Dransfeld 2008-01-20 19:42:38 +00:00
parent b6b7fa2cd4
commit a4d407fe4c
3 changed files with 16 additions and 8 deletions

View File

@ -185,7 +185,6 @@ PKG_CHECK_MODULES(E, [
ecore-ipc ecore-ipc
ecore-con ecore-con
ecore-job ecore-job
ecore-txt
ecore-imf ecore-imf
ecore-imf-evas ecore-imf-evas
edje edje
@ -195,11 +194,17 @@ PKG_CHECK_MODULES(E, [
efreet-mime efreet-mime
]) ])
# ecore-txt is really only needed by the temperature module, PKG_CHECK_MODULES(ECORE_TXT, [
# so we check for it separately. ecore-txt
# in a perfect world, we'd also disable the temperate module here ], [
# if ecore-txt isn't available. have_temp="yes"
PKG_CHECK_MODULES(ECORE_TXT, ecore-txt) # This test will succeed as these modules are also checked before
PKG_CHECK_MODULES(TEMPERATURE, [
ecore
ecore-file
])
], [ have_temp="no"])
AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no)
PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no)

View File

@ -5,7 +5,6 @@ dropshadow \
clock \ clock \
pager \ pager \
battery \ battery \
temperature \
cpufreq \ cpufreq \
ibox \ ibox \
start \ start \
@ -51,3 +50,7 @@ conf_winlist \
conf_exebuf \ conf_exebuf \
conf_paths \ conf_paths \
conf_mime conf_mime
if HAVE_TEMPERATURE
SUBDIRS += temperature
endif

View File

@ -35,7 +35,7 @@ install-data-hook:
noinst_PROGRAMS = tempget noinst_PROGRAMS = tempget
tempget_SOURCES = tempget.c tempget_SOURCES = tempget.c
tempget_LDFLAGS = @e_libs@ tempget_LDFLAGS = @TEMPERATURE_LIBS@
uninstall: uninstall:
rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)