pidgin: cbfe9639: Fix compiling 'make plugin.so' when srcd...
sadrul at pidgin.im
sadrul at pidgin.im
Mon Sep 1 12:10:38 EDT 2008
-----------------------------------------------------------------
Revision: cbfe9639dab88cdedd221e9ad73b0fe9c533d80c
Ancestor: a6f0856683b8c919dfe45c4b0b50fe5b69f43f68
Author: sadrul at pidgin.im
Date: 2008-09-01T16:16:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cbfe9639dab88cdedd221e9ad73b0fe9c533d80c
Modified files:
finch/plugins/Makefile.am pidgin/plugins/Makefile.am
ChangeLog:
Fix compiling 'make plugin.so' when srcdir != builddir. This should've been part of the last commit.
-------------- next part --------------
============================================================
--- finch/plugins/Makefile.am 90e6e785137431ec3787d3dce8469e8b4939921e
+++ finch/plugins/Makefile.am 7eac62a43baa103d3e2601353505256a0dc11b1a
@@ -52,7 +52,7 @@ SUFFIXES = .c .so
#
SUFFIXES = .c .so
.c.so:
- $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
@rm -f tmp$@.lo tmp$@.o libtmp$@.la
@cp .libs/libtmp$@.so* $@
============================================================
--- pidgin/plugins/Makefile.am e7914e5794d8faeab41b8e54d575663109a8a9bc
+++ pidgin/plugins/Makefile.am 48cdb81a1b626377bf739819f346282e031a0265
@@ -132,7 +132,7 @@ SUFFIXES = .c .so
#
SUFFIXES = .c .so
.c.so:
- $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
@rm -f tmp$@.lo tmp$@.o libtmp$@.la
@cp .libs/libtmp$@.so* $@
More information about the Commits
mailing list