[gnome-photos/wip/inigomartinez/meson: 1/4] build: Updated autotools to use libgd module at subprojects
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/inigomartinez/meson: 1/4] build: Updated autotools to use libgd module at subprojects
- Date: Thu, 31 Aug 2017 17:21:33 +0000 (UTC)
commit d2feeb4b126d816e8f11972d4266d90277f95ea4
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Aug 30 17:20:20 2017 +0200
build: Updated autotools to use libgd module at subprojects
In order to ease the meson build port, the libgd module has been
moved to subprojects directory.
.gitmodules | 4 ++--
Makefile.am | 4 ++--
configure.ac | 4 ++--
src/Makefile.am | 4 ++--
libgd => subprojects/libgd | 0
5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index bfd964e..e91a9d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libgd"]
- path = libgd
+[submodule "subprojects/libgd"]
+ path = subprojects/libgd
url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index 14b8fa5..ff4f4eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I subprojects/libgd ${ACLOCAL_FLAGS}
-SUBDIRS = . data libgd src po tests help
+SUBDIRS = . data subprojects/libgd src po tests help
INTLTOOL_FILES = \
intltool-extract.in \
diff --git a/configure.ac b/configure.ac
index 8ed3638..8df14ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ LIBGD_INIT([
main-icon-view
static
tagged-entry
-])
+][subprojects/libgd])
AC_ARG_ENABLE(dogtail,
[AS_HELP_STRING([--enable-dogtail],
@@ -158,7 +158,7 @@ data/Makefile
data/org.gnome.Photos.desktop.in
data/icons/Makefile
help/Makefile
-libgd/Makefile
+subprojects/libgd/Makefile
src/Makefile
tests/Makefile
po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 392b7d6..8f9efee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -405,7 +405,7 @@ AM_CPPFLAGS = \
$(GTK_UNIX_PRINT_CFLAGS) \
$(PNG_CFLAGS) \
$(TRACKER_CFLAGS) \
- -I$(top_srcdir)/libgd \
+ -I$(top_srcdir)/subprojects/libgd \
$(NULL)
AM_CFLAGS = \
@@ -436,7 +436,7 @@ gnome_photos_LDADD = \
$(TRACKER_LIBS) \
$(LIBM) \
$(LIBRT) \
- $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/subprojects/libgd/libgd.la \
$(NULL)
gnome_photos_thumbnailer_LDFLAGS = \
diff --git a/libgd b/subprojects/libgd
similarity index 100%
rename from libgd
rename to subprojects/libgd
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]