Mercurial Mercurial > mcabber-isbear-patches / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enable-separate-build.diff
author Myhailo Danylenko <isbear@ukrpost.net>
Tue, 27 Nov 2012 01:57:06 +0200
changeset 57 cfa24a16e928
parent 55 fix-separate-build.diff@8f5cf5969e25
child 58 04cb7d38c438
permissions -rw-r--r--
Drop accepted, add guide to seaprate-build * remove fix-api-h and fix-xttitle-include - accepted upstream * rename fix-separate-build to enable-separate-build, change description * enable-separate-build can now build guide separately * refresh

# HG changeset patch
# Parent e87ced7d1059b787b075da79c3ae0b6477bfccca
Enable building from separate directory

diff -r e87ced7d1059 mcabber/doc/guide/Makefile.am
--- a/mcabber/doc/guide/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/doc/guide/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -1,8 +1,11 @@
+
 guide:
-	pdflatex guide
-	bibtex guide
-	pdflatex guide
-	pdflatex guide
+	cd $(srcdir) && \
+	pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide
+	BIBINPUTS=$(srcdir) bibtex guide
+	cd $(srcdir) && \
+	pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide && \
+	pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide
 
 clean-guide:
 	rm -f *.aux *.blg *.dvi *.toc *.out *.bbl *.log *.pdf
diff -r e87ced7d1059 mcabber/hgcset.sh
--- a/mcabber/hgcset.sh	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/hgcset.sh	Tue Nov 27 01:54:18 2012 +0200
@@ -1,19 +1,24 @@
 #! /bin/sh
 
-if [ ! -f logprint.h ]; then
-  echo "You are not in the mcabber directory" >&2
+srcdir="$1"
+builddir="$2"
+
+if [ ! -f "$srcdir/logprint.h" ]; then
+  echo "Unable to find mcabber sources!" >&2
   exit 1
 fi
 
+cd "$srcdir"
+
 if which hg > /dev/null 2>&1; then
   cs=$(hg id 2> /dev/null | cut -d' ' -f1)
   if test $? -eq 0; then
     if [ x"$cs" != x ]; then
-      grep -q "$cs" hgcset.h > /dev/null 2>&1 || \
-        echo "#define HGCSET \"$cs\"" > hgcset.h
+      grep -q "$cs" "$builddir/hgcset.h" > /dev/null 2>&1 || \
+        echo "#define HGCSET \"$cs\"" > "$builddir/hgcset.h"
       exit 0
     fi
   fi
 fi
 
-echo > hgcset.h
+echo > "$builddir/hgcset.h"
diff -r e87ced7d1059 mcabber/mcabber/Makefile.am
--- a/mcabber/mcabber/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/mcabber/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -16,7 +16,8 @@
 LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
 				$(ENCHANT_LIBS) $(LIBIDN_LIBS)
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
+				$(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
 				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
 				$(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
 
@@ -26,7 +27,7 @@
 BUILT_SOURCES = hgcset.h
 
 hgcset.h:
-	../hgcset.sh
+	$(top_srcdir)/hgcset.sh "$(top_srcdir)/mcabber" "$(top_builddir)/mcabber"
 
 .PHONY: hgcset.h
 endif
@@ -42,7 +43,7 @@
 			 xmpp_iq.h xmpp_iqrequest.h \
 			 xmpp_muc.h xmpp_s10n.h \
 			 caps.h fifo.h help.h modules.h api.h \
-			 $(top_srcdir)/include/config.h
+			 $(top_builddir)/include/config.h
 
 if OTR
 mcabberinclude_HEADERS += otr.h nohtml.h
diff -r e87ced7d1059 mcabber/modules/beep/Makefile.am
--- a/mcabber/modules/beep/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/modules/beep/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -6,7 +6,8 @@
 libbeep_la_LDFLAGS = -module -avoid-version -shared
 
 LDADD = $(GLIB_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
+			      $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
                               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
                               $(ENCHANT_CFLAGS)
 
diff -r e87ced7d1059 mcabber/modules/fifo/Makefile.am
--- a/mcabber/modules/fifo/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/modules/fifo/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -5,7 +5,8 @@
 libfifo_la_LDFLAGS = -module -avoid-version -shared
 
 LDADD = $(GLIB_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
+				$(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
 				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
 				$(ENCHANT_CFLAGS)
 endif
diff -r e87ced7d1059 mcabber/modules/urlregex/Makefile.am
--- a/mcabber/modules/urlregex/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/modules/urlregex/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -6,7 +6,8 @@
 liburlregex_la_LDFLAGS = -module -avoid-version -shared
 
 LDADD = $(GLIB_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
+			      $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
                               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
                               $(ENCHANT_CFLAGS)
 
diff -r e87ced7d1059 mcabber/modules/xttitle/Makefile.am
--- a/mcabber/modules/xttitle/Makefile.am	Mon Nov 26 11:55:22 2012 +0100
+++ b/mcabber/modules/xttitle/Makefile.am	Tue Nov 27 01:54:18 2012 +0200
@@ -6,7 +6,8 @@
 libxttitle_la_LDFLAGS = -module -avoid-version -shared
 
 LDADD = $(GLIB_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
+              $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) $(ENCHANT_CFLAGS)
 
 endif
mcabber-isbear-patches