trivial: Define the build dir outside the source file

This commit is contained in:
Richard Hughes 2017-04-12 14:26:14 +01:00
parent f985a8f7b7
commit d3f4b5a428
8 changed files with 9 additions and 5 deletions

View File

@ -61,6 +61,7 @@ fu_self_test_LDFLAGS = \
fu_self_test_CFLAGS = \
-DFU_OFFLINE_DESTDIR=\"/tmp/fwupd-self-test\" \
-DLOCALSTATEDIR=\"/tmp/fwupd-self-test/var\" \
-DPLUGINBUILDDIR=\".libs\" \
$(WARN_CFLAGS)
noinst_PROGRAMS = \

View File

@ -57,7 +57,7 @@ fu_plugin_dell_tpm_func (void)
g_setenv ("FWUPD_DELL_FAKE_SMBIOS", "1", FALSE);
plugin = fu_plugin_new ();
ret = fu_plugin_open (plugin, ".libs/libfu_plugin_dell.so", &error);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_dell.so", &error);
g_assert_no_error (error);
g_assert (ret);
ret = fu_plugin_runner_startup (plugin, &error);
@ -243,7 +243,7 @@ fu_plugin_dell_dock_func (void)
g_setenv ("FWUPD_DELL_FAKE_SMBIOS", "1", FALSE);
plugin = fu_plugin_new ();
ret = fu_plugin_open (plugin, ".libs/libfu_plugin_dell.so", &error);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_dell.so", &error);
g_assert_no_error (error);
g_assert (ret);
ret = fu_plugin_runner_startup (plugin, &error);

View File

@ -63,6 +63,7 @@ fu_self_test_LDFLAGS = \
fu_self_test_CFLAGS = \
-DFU_OFFLINE_DESTDIR=\"/tmp/fwupd-self-test\" \
-DLOCALSTATEDIR=\"/tmp/fwupd-self-test/var\" \
-DPLUGINBUILDDIR=\".libs\" \
$(WARN_CFLAGS)
TESTS = fu-self-test

View File

@ -78,7 +78,7 @@ fu_plugin_raspberrypi_func (void)
/* create a fake device */
plugin = fu_plugin_new ();
ret = fu_plugin_open (plugin, ".libs/libfu_plugin_raspberrypi.so", &error);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_raspberrypi.so", &error);
g_assert_no_error (error);
g_assert (ret);

View File

@ -86,6 +86,7 @@ fu_self_test_LDFLAGS = \
fu_self_test_CFLAGS = \
-DFU_OFFLINE_DESTDIR=\"/tmp/fwupd-self-test\" \
-DLOCALSTATEDIR=\"/tmp/fwupd-self-test/var\" \
-DPLUGINBUILDDIR=\".libs\" \
$(WARN_CFLAGS)
TESTS = fu-self-test

View File

@ -66,7 +66,7 @@ fu_plugin_synapticsmst_func (void)
g_signal_connect (plugin, "status-changed",
G_CALLBACK (_plugin_status_changed_cb),
&cnt);
ret = fu_plugin_open (plugin, ".libs/libfu_plugin_synapticsmst.so", &error);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_synapticsmst.so", &error);
g_assert_no_error (error);
g_assert (ret);
ret = fu_plugin_runner_startup (plugin, &error);

View File

@ -157,6 +157,7 @@ fu_self_test_LDFLAGS = \
fu_self_test_CFLAGS = \
-DFU_OFFLINE_DESTDIR=\"/tmp/fwupd-self-test\" \
-DLOCALSTATEDIR=\"/tmp/fwupd-self-test/var\" \
-DPLUGINBUILDDIR=\"../plugins/test/.libs\" \
$(WARN_CFLAGS)
TESTS = fu-self-test

View File

@ -167,7 +167,7 @@ fu_plugin_module_func (void)
/* create a fake device */
plugin = fu_plugin_new ();
ret = fu_plugin_open (plugin, "../plugins/test/.libs/libfu_plugin_test.so", &error);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_test.so", &error);
g_assert_no_error (error);
g_assert (ret);
ret = fu_plugin_runner_startup (plugin, &error);