Commit aef6880c authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

build: fix builddir != srcdir

parent c819d991
......@@ -11,7 +11,7 @@ MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
`find "m4" -type f -name "*.m4" -print` \
`find "$(srcdir)/m4" -type f -name "*.m4" -print` \
$(srcdir)/ABOUT-NLS \
$(srcdir)/INSTALL \
$(srcdir)/config.h.in~ \
......
......@@ -11,6 +11,9 @@ if [ ! -f $srcdir/configure.ac ]; then
exit 1
fi
olddir=$(pwd)
cd "$srcdir"
if [ ! -f $srcdir/gnome-flashback/libsound-applet/gvc/Makefile.am ]; then
set -x
git submodule init
......@@ -34,6 +37,8 @@ aclocal --install || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
{ set +x; } 2>/dev/null
cd "$olddir"
if [ -z "$NOCONFIGURE" ]; then
set -x
$srcdir/configure "$@" || exit 1
......
......@@ -7,13 +7,14 @@ noinst_LTLIBRARIES = \
libbluetooth_applet_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"bluetooth-applet\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_builddir)/gnome-flashback/libbluetooth-applet \
-I$(top_srcdir) \
$(NULL)
libbluetooth_applet_la_CFLAGS = \
$(BLUETOOTH_APPLET_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
-I$(top_builddir)/gnome-flashback/libbluetooth-applet \
$(NULL)
libbluetooth_applet_la_SOURCES = \
......
......@@ -40,7 +40,7 @@ dbus-end-session-dialog.c: org.gnome.SessionManager.EndSessionDialog.xml Makefil
--interface-prefix=org.gnome.SessionManager \
--generate-c-code dbus-end-session-dialog \
--c-namespace DBus \
org.gnome.SessionManager.EndSessionDialog.xml
$(srcdir)/org.gnome.SessionManager.EndSessionDialog.xml
BUILT_SOURCES = \
dbus-end-session-dialog.h \
......
......@@ -7,6 +7,7 @@ noinst_LTLIBRARIES = \
libinput_settings_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"input-settings\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_builddir)/gnome-flashback/libdisplay-config \
-I$(top_builddir)/gnome-flashback/libinput-settings \
-I$(top_srcdir)/gnome-flashback \
$(NULL)
......
......@@ -7,16 +7,16 @@ noinst_LTLIBRARIES = \
libinput_sources_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"input-sources\" \
-DG_LOG_USE_STRUCTURED=1 \
-DGNOME_DESKTOP_USE_UNSTABLE_API \
-I$(top_builddir)/gnome-flashback/libinput-sources \
-I$(top_srcdir) \
-I$(top_srcdir)/gnome-flashback \
$(NULL)
libinput_sources_la_CFLAGS = \
$(INPUT_SOURCES_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
-I$(srcdir)/../../gnome-flashback \
-I$(top_builddir)/gnome-flashback \
-I$(top_builddir)/gnome-flashback/libinput-sources \
-DGNOME_DESKTOP_USE_UNSTABLE_API \
$(NULL)
libinput_sources_la_SOURCES = \
......
......@@ -7,13 +7,14 @@ noinst_LTLIBRARIES = \
libpower_applet_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"power-applet\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_builddir)/gnome-flashback/libpower-applet \
-I$(top_srcdir) \
$(NULL)
libpower_applet_la_CFLAGS = \
$(POWER_APPLET_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
-I$(top_builddir)/gnome-flashback/libpower-applet \
$(NULL)
libpower_applet_la_SOURCES = \
......
......@@ -7,16 +7,16 @@ noinst_LTLIBRARIES = \
libshell_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"shell\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_builddir)/gnome-flashback/libcommon \
-I$(top_builddir)/gnome-flashback/libdisplay-config \
-I$(top_builddir)/gnome-flashback/libshell \
-I$(top_srcdir)/gnome-flashback \
$(NULL)
libshell_la_CFLAGS = \
$(SHELL_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
-I$(srcdir)/../../gnome-flashback \
-I$(top_builddir)/gnome-flashback \
-I$(top_builddir)/gnome-flashback/libcommon \
-I$(top_builddir)/gnome-flashback/libshell \
$(NULL)
libshell_la_SOURCES = \
......
......@@ -11,14 +11,15 @@ noinst_LTLIBRARIES = \
libsound_applet_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"sound-applet\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_builddir)/gnome-flashback/libsound-applet \
-I$(top_srcdir) \
-I$(srcdir)/gvc \
$(NULL)
libsound_applet_la_CFLAGS = \
$(SOUND_APPLET_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
-I$(top_builddir)/gnome-flashback/libsound-applet \
-I$(srcdir)/gvc \
$(NULL)
libsound_applet_la_SOURCES = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment