Commit e47d0382 authored by Sébastien Wilmet's avatar Sébastien Wilmet

Add libgd git submodule

parent 575af379
[submodule "libgd"]
path = libgd
url = ../libgd
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
SUBDIRS = gedit pixmaps po plugins data docs tests win32 osx SUBDIRS = libgd gedit pixmaps po plugins data docs tests win32 osx
if !OS_OSX if !OS_OSX
SUBDIRS += help SUBDIRS += help
......
...@@ -357,6 +357,12 @@ GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS $UNIX_LIBS" ...@@ -357,6 +357,12 @@ GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS $UNIX_LIBS"
AC_SUBST(GEDIT_CFLAGS) AC_SUBST(GEDIT_CFLAGS)
AC_SUBST(GEDIT_LIBS) AC_SUBST(GEDIT_LIBS)
dnl ================================================================
dnl libgd
dnl ================================================================
LIBGD_INIT([tagged-entry static])
dnl ================================================================ dnl ================================================================
dnl GSettings stuff dnl GSettings stuff
dnl ================================================================ dnl ================================================================
...@@ -441,6 +447,7 @@ docs/Makefile ...@@ -441,6 +447,7 @@ docs/Makefile
docs/reference/Makefile docs/reference/Makefile
gedit/Makefile gedit/Makefile
help/Makefile help/Makefile
libgd/Makefile
pixmaps/Makefile pixmaps/Makefile
plugins/Makefile plugins/Makefile
plugins/changecase/Makefile plugins/changecase/Makefile
......
...@@ -8,6 +8,7 @@ pkglib_LTLIBRARIES = libgedit-private.la ...@@ -8,6 +8,7 @@ pkglib_LTLIBRARIES = libgedit-private.la
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_srcdir)/libgd \
$(GEDIT_CFLAGS) \ $(GEDIT_CFLAGS) \
$(GTK_MAC_CFLAGS) \ $(GTK_MAC_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
...@@ -35,7 +36,10 @@ endif ...@@ -35,7 +36,10 @@ endif
libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
# GEDIT_LIBS must be the last to ensure correct order on some platforms # GEDIT_LIBS must be the last to ensure correct order on some platforms
libgedit_la_LIBADD = $(GEDIT_LIBS) $(GTK_MAC_LIBS) libgedit_la_LIBADD = \
$(top_builddir)/libgd/libgd.la \
$(GEDIT_LIBS) \
$(GTK_MAC_LIBS)
libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS) libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
......
Subproject commit 7f080984bf6a92212def9fb8aa0f6c0f9979b57e
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