Commit e9d9814d authored by Iñigo Martínez's avatar Iñigo Martínez Committed by Debarshi Ray

build: Move libgd module to subprojects

In order to ease the Meson build port, this patch moves the libgd
module to the subprojects directory.

!48
parent b36ad3f4
[submodule "libgd"]
path = libgd
[submodule "subprojects/libgd"]
path = subprojects/libgd
url = https://gitlab.gnome.org/GNOME/libgd.git
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
photosdocdir = $(docdir)
photosdoc_DATA = \
......
......@@ -122,7 +122,7 @@ LIBGD_INIT([
main-icon-view
static
tagged-entry
])
][subprojects/libgd])
AC_ARG_ENABLE(dogtail,
[AS_HELP_STRING([--enable-dogtail],
......@@ -154,7 +154,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
......
......@@ -416,7 +416,7 @@ AM_CPPFLAGS = \
$(GTK_UNIX_PRINT_CFLAGS) \
$(PNG_CFLAGS) \
$(TRACKER_CFLAGS) \
-I$(top_srcdir)/libgd \
-I$(top_srcdir)/subprojects/libgd \
$(NULL)
AM_CFLAGS = \
......@@ -448,7 +448,7 @@ gnome_photos_LDADD = \
$(TRACKER_LIBS) \
$(LIBM) \
$(LIBRT) \
$(top_builddir)/libgd/libgd.la \
$(top_builddir)/subprojects/libgd/libgd.la \
$(NULL)
gnome_photos_thumbnailer_LDFLAGS = \
......
File moved
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