Revert changes made in commit ed7abdb for building with libgd

After porting to GtkStack, we do not need them any more.
This commit is contained in:
Techlive Zheng 2013-05-31 01:08:06 +08:00 committed by Ignacio Casal Quinteiro
parent 1480823969
commit 5e35e3a67a
3 changed files with 5 additions and 8 deletions

View file

@ -221,12 +221,12 @@ AC_SUBST(GITG_PLUGIN_DATADIR)
GITG_PLUGIN_LIBDIR="$libdir/gitg/plugins"
AC_SUBST(GITG_PLUGIN_LIBDIR)
GITG_PLUGIN_CFLAGS="-I\$(top_srcdir)/libgd $GITG_CFLAGS"
GITG_PLUGIN_CFLAGS="$GITG_CFLAGS"
GITG_PLUGIN_LIBS="$GITG_LIBS \
\$(top_builddir)/libgd/libgd.la \
\$(top_builddir)/libgitg/libgitg-1.0.la \
\$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
\$(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la \
\$(top_builddir)/libgd/libgd.la"
\$(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la"
AC_SUBST(GITG_PLUGIN_CFLAGS)
AC_SUBST(GITG_PLUGIN_LIBS)

View file

@ -3,7 +3,6 @@ lib_LTLIBRARIES = libgitg-ext-1.0.la
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(top_srcdir)/libgd \
$(LIBGITG_EXT_CFLAGS) \
$(WARN_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
@ -15,15 +14,12 @@ COMMON_VALA_FLAGS = \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
--pkg gee-0.8 \
--pkg gd-1.0 \
--basedir $(top_srcdir) \
--vapidir $(top_builddir)/libgd \
--vapidir $(top_builddir)/libgitg
AM_VALAFLAGS = \
$(COMMON_VALA_FLAGS) \
--gir GitgExt-1.0.gir \
--girdir $(top_builddir)/libgd \
--girdir $(top_builddir)/libgitg \
--includedir libgitg-ext \
--header libgitg-ext.h \
@ -83,7 +79,7 @@ typelibdir = $(INTROSPECTION_TYPELIBDIR)
typelib_DATA = GitgExt-1.0.typelib
%.typelib: %.gir
$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. --includedir=$(top_builddir)/libgd --includedir=$(top_builddir)/libgitg -o $@ $<
$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. --includedir=$(top_builddir)/libgitg -o $@ $<
if ENABLE_PYTHON
overridesdir = $(pyoverridesdir)

View file

@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(top_srcdir)/libgd \
$(GITG_PLUGIN_CFLAGS) \
$(WARN_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \