no need for AM_LIBADD in any of these makefiles either

SVN revision: 79171
This commit is contained in:
Mike Blumenkrantz 2012-11-12 15:11:12 +00:00
parent 868e9820e4
commit 62004a922e
8 changed files with 8 additions and 10 deletions

View File

@ -9,7 +9,6 @@ batterypkg_LTLIBRARIES = battery/module.la
battery_module_la_DEPENDENCIES = $(MDEPENDENCIES) battery_module_la_DEPENDENCIES = $(MDEPENDENCIES)
battery_module_la_CFLAGS = $(AM_CFLAGS) battery_module_la_CFLAGS = $(AM_CFLAGS)
battery_module_la_LIBADD = $(AM_LIBADD)
battery_module_la_SOURCES = battery/e_mod_main.h \ battery_module_la_SOURCES = battery/e_mod_main.h \
battery/e_mod_main.c \ battery/e_mod_main.c \
battery/e_mod_config.c battery/e_mod_config.c
@ -26,7 +25,7 @@ endif
if HAVE_ENOTIFY if HAVE_ENOTIFY
battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@ battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@
battery_module_la_LIBADD += @ENOTIFY_LIBS@ battery_module_la_LIBADD = @ENOTIFY_LIBS@
endif endif
batgetdir = $(batterypkgdir) batgetdir = $(batterypkgdir)

View File

@ -37,5 +37,5 @@ comp_module_la_SOURCES += comp/e_mod_comp_wl.h \
comp/e_mod_comp_wl_region.c comp/e_mod_comp_wl_region.c
endif endif
comp_module_la_LIBADD = $(AM_LIBADD) @WAYLAND_LIBS@ comp_module_la_LIBADD = @WAYLAND_LIBS@
comp_module_la_DEPENDENCIES = $(MDEPENDENCIES) comp_module_la_DEPENDENCIES = $(MDEPENDENCIES)

View File

@ -17,5 +17,5 @@ connman_module_la_SOURCES = connman/e_mod_main.h \
connman/E_Connman.h connman/E_Connman.h
connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
connman_module_la_LIBADD = $(AM_LIBADD) @ECONNMAN_LIBS@ connman_module_la_LIBADD = @ECONNMAN_LIBS@
connman_module_la_DEPENDENCIES = $(MDEPENDENCIES) connman_module_la_DEPENDENCIES = $(MDEPENDENCIES)

View File

@ -30,5 +30,5 @@ illume_indicator_module_la_SOURCES += illume-indicator/e_mod_notify.c \
illume-indicator/e_mod_notify.h illume-indicator/e_mod_notify.h
endif endif
illume_indicator_module_la_LIBADD = $(AM_LIBADD) @ENOTIFY_LIBS@ illume_indicator_module_la_LIBADD = @ENOTIFY_LIBS@
illume_indicator_module_la_DEPENDENCIES = $(MDEPENDENCIES) illume_indicator_module_la_DEPENDENCIES = $(MDEPENDENCIES)

View File

@ -8,7 +8,6 @@ mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
mixerpkg_LTLIBRARIES = mixer/module.la mixerpkg_LTLIBRARIES = mixer/module.la
mixer_module_la_CFLAGS = $(AM_CFLAGS) mixer_module_la_CFLAGS = $(AM_CFLAGS)
mixer_module_la_LIBADD = $(AM_LIBADD)
mixer_module_la_SOURCES = mixer/e_mod_main.c \ mixer_module_la_SOURCES = mixer/e_mod_main.c \
mixer/e_mod_main.h \ mixer/e_mod_main.h \
@ -31,7 +30,7 @@ else
mixer_module_la_SOURCES += mixer/sys_dummy.c mixer_module_la_SOURCES += mixer/sys_dummy.c
endif endif
mixer_module_la_LIBADD += @SOUND_LIBS@ mixer_module_la_LIBADD = @SOUND_LIBS@
if HAVE_ENOTIFY if HAVE_ENOTIFY
mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@ mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@

View File

@ -14,5 +14,5 @@ notification_module_la_SOURCES = notification/e_mod_main.h \
notification/e_mod_config_item.c \ notification/e_mod_config_item.c \
notification/e_mod_popup.c notification/e_mod_popup.c
notification_module_la_LIBADD = $(AM_LIBADD) @ENOTIFY_LIBS@ notification_module_la_LIBADD = @ENOTIFY_LIBS@
notification_module_la_DEPENDENCIES = $(MDEPENDENCIES) notification_module_la_DEPENDENCIES = $(MDEPENDENCIES)

View File

@ -16,5 +16,5 @@ physics_module_la_SOURCES = physics/e_mod_main.c \
physics/e_mod_physics.c \ physics/e_mod_physics.c \
physics/e_mod_physics.h physics/e_mod_physics.h
physics_module_la_LIBADD = $(AM_LIBADD) @EPHYSICS_LIBS@ physics_module_la_LIBADD = @EPHYSICS_LIBS@
physics_module_la_DEPENDENCIES = $(MDEPENDENCIES) physics_module_la_DEPENDENCIES = $(MDEPENDENCIES)

View File

@ -87,7 +87,7 @@ wizard_page_100_la_DEPENDENCIES = $(MDEPENDENCIES)
if USE_MODULE_CONNMAN if USE_MODULE_CONNMAN
wizard_page_110_la_SOURCES = wizard/page_110.c wizard_page_110_la_SOURCES = wizard/page_110.c
wizard_page_110_la_LIBADD = $(AM_LIBADD) @ECONNMAN_LIBS@ wizard_page_110_la_LIBADD = @ECONNMAN_LIBS@
wizard_page_110_la_DEPENDENCIES = $(MDEPENDENCIES) wizard_page_110_la_DEPENDENCIES = $(MDEPENDENCIES)
endif endif