Separate libsugar and libsugarui ld flags to not

link libsugar to gtk.
This commit is contained in:
Marco Pesenti Gritti 2007-08-11 01:00:53 +02:00
parent c571993811
commit 05b0d212a4
2 changed files with 18 additions and 12 deletions

View File

@ -21,8 +21,10 @@ PKG_CHECK_MODULES(SHELL, pygtk-2.0 gtk+-2.0)
PKG_CHECK_MODULES(NATIVE_FACTORY, dbus-1) PKG_CHECK_MODULES(NATIVE_FACTORY, dbus-1)
PKG_CHECK_MODULES(LIB, gtk+-2.0) PKG_CHECK_MODULES(LIBUI, gtk+-2.0)
PKG_CHECK_MODULES(LIB_BINDINGS, pygtk-2.0) PKG_CHECK_MODULES(LIBUI_BINDINGS, pygtk-2.0)
PKG_CHECK_MODULES(LIB_BINDINGS, pygobject-2.0)
PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFSDIR) AC_SUBST(PYGTK_DEFSDIR)

View File

@ -12,21 +12,19 @@ sugar_PYTHON = \
util.py \ util.py \
wm.py wm.py
INCLUDES = \
$(LIB_CFLAGS) \
$(LIB_BINDINGS_CFLAGS) \
$(PYTHON_INCLUDES) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/ui
pkgpyexecdir = $(pythondir)/sugar pkgpyexecdir = $(pythondir)/sugar
pkgpyexec_LTLIBRARIES = _sugarext.la _sugaruiext.la pkgpyexec_LTLIBRARIES = _sugarext.la _sugaruiext.la
_sugarext_la_CFLAGS = \
$(LIB_CFLAGS) \
$(LIB_BINDINGS_CFLAGS) \
$(PYTHON_INCLUDES) \
-I$(top_srcdir)/lib
_sugarext_la_LDFLAGS = -module -avoid-version _sugarext_la_LDFLAGS = -module -avoid-version
_sugarext_la_LIBADD = \ _sugarext_la_LIBADD = \
$(LIB_BINDINGS_LIBS) \ $(LIB_BINDINGS_LIBS) \
$(LIB_LIBS) \
$(top_builddir)/lib/libsugar.la $(top_builddir)/lib/libsugar.la
_sugarext_la_SOURCES = \ _sugarext_la_SOURCES = \
@ -36,10 +34,16 @@ nodist__sugarext_la_SOURCES = _sugarext.c
_sugarext.c: _sugarext.defs _sugarext.override _sugarext.c: _sugarext.defs _sugarext.override
_sugaruiext_la_CFLAGS = \
$(LIBUI_CFLAGS) \
$(LIBUI_BINDINGS_CFLAGS) \
$(PYTHON_INCLUDES) \
-I$(top_srcdir)/lib/ui
_sugaruiext_la_LDFLAGS = -module -avoid-version _sugaruiext_la_LDFLAGS = -module -avoid-version
_sugaruiext_la_LIBADD = \ _sugaruiext_la_LIBADD = \
$(LIB_BINDINGS_LIBS) \ $(LIBUI_BINDINGS_LIBS) \
$(LIB_LIBS) \ $(LIBUI_LIBS) \
$(top_builddir)/lib/ui/libsugarui.la $(top_builddir)/lib/ui/libsugarui.la
_sugaruiext_la_SOURCES = \ _sugaruiext_la_SOURCES = \