diff --git a/src/modules/Makefile_battery.am b/src/modules/Makefile_battery.am index e0e56b988..e8e47efbc 100644 --- a/src/modules/Makefile_battery.am +++ b/src/modules/Makefile_battery.am @@ -9,7 +9,6 @@ batterypkg_LTLIBRARIES = battery/module.la battery_module_la_DEPENDENCIES = $(MDEPENDENCIES) battery_module_la_CFLAGS = $(AM_CFLAGS) -battery_module_la_LIBADD = $(AM_LIBADD) battery_module_la_SOURCES = battery/e_mod_main.h \ battery/e_mod_main.c \ battery/e_mod_config.c @@ -26,7 +25,7 @@ endif if HAVE_ENOTIFY battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@ -battery_module_la_LIBADD += @ENOTIFY_LIBS@ +battery_module_la_LIBADD = @ENOTIFY_LIBS@ endif batgetdir = $(batterypkgdir) diff --git a/src/modules/Makefile_comp.am b/src/modules/Makefile_comp.am index 635950b9a..ed5f49bda 100644 --- a/src/modules/Makefile_comp.am +++ b/src/modules/Makefile_comp.am @@ -37,5 +37,5 @@ comp_module_la_SOURCES += comp/e_mod_comp_wl.h \ comp/e_mod_comp_wl_region.c endif -comp_module_la_LIBADD = $(AM_LIBADD) @WAYLAND_LIBS@ +comp_module_la_LIBADD = @WAYLAND_LIBS@ comp_module_la_DEPENDENCIES = $(MDEPENDENCIES) diff --git a/src/modules/Makefile_connman.am b/src/modules/Makefile_connman.am index d708f2dcd..892e923a3 100644 --- a/src/modules/Makefile_connman.am +++ b/src/modules/Makefile_connman.am @@ -17,5 +17,5 @@ connman_module_la_SOURCES = connman/e_mod_main.h \ connman/E_Connman.h 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) diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am index 437a26d0e..5971c5672 100644 --- a/src/modules/Makefile_illume-indicator.am +++ b/src/modules/Makefile_illume-indicator.am @@ -30,5 +30,5 @@ illume_indicator_module_la_SOURCES += illume-indicator/e_mod_notify.c \ illume-indicator/e_mod_notify.h endif -illume_indicator_module_la_LIBADD = $(AM_LIBADD) @ENOTIFY_LIBS@ +illume_indicator_module_la_LIBADD = @ENOTIFY_LIBS@ illume_indicator_module_la_DEPENDENCIES = $(MDEPENDENCIES) diff --git a/src/modules/Makefile_mixer.am b/src/modules/Makefile_mixer.am index 672aa74f8..077be63f1 100644 --- a/src/modules/Makefile_mixer.am +++ b/src/modules/Makefile_mixer.am @@ -8,7 +8,6 @@ mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH) mixerpkg_LTLIBRARIES = mixer/module.la mixer_module_la_CFLAGS = $(AM_CFLAGS) -mixer_module_la_LIBADD = $(AM_LIBADD) mixer_module_la_SOURCES = mixer/e_mod_main.c \ mixer/e_mod_main.h \ @@ -31,7 +30,7 @@ else mixer_module_la_SOURCES += mixer/sys_dummy.c endif -mixer_module_la_LIBADD += @SOUND_LIBS@ +mixer_module_la_LIBADD = @SOUND_LIBS@ if HAVE_ENOTIFY mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@ diff --git a/src/modules/Makefile_notification.am b/src/modules/Makefile_notification.am index f7fe4b334..14080195f 100644 --- a/src/modules/Makefile_notification.am +++ b/src/modules/Makefile_notification.am @@ -14,5 +14,5 @@ notification_module_la_SOURCES = notification/e_mod_main.h \ notification/e_mod_config_item.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) diff --git a/src/modules/Makefile_physics.am b/src/modules/Makefile_physics.am index 9ad17647d..531ab9fd1 100644 --- a/src/modules/Makefile_physics.am +++ b/src/modules/Makefile_physics.am @@ -16,5 +16,5 @@ physics_module_la_SOURCES = physics/e_mod_main.c \ physics/e_mod_physics.c \ physics/e_mod_physics.h -physics_module_la_LIBADD = $(AM_LIBADD) @EPHYSICS_LIBS@ +physics_module_la_LIBADD = @EPHYSICS_LIBS@ physics_module_la_DEPENDENCIES = $(MDEPENDENCIES) diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am index 4474fb43c..a059337b0 100644 --- a/src/modules/Makefile_wizard.am +++ b/src/modules/Makefile_wizard.am @@ -87,7 +87,7 @@ wizard_page_100_la_DEPENDENCIES = $(MDEPENDENCIES) if USE_MODULE_CONNMAN 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) endif