Changeset 5f40da7 for Makefile

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
+all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) doc systemd
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype doc
+endif
+
+doc:
         $(MAKE) -C doc
-ifdef SKYPE_PI
-        $(MAKE) -C protocols/skype doc
-endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -43 +45 @@
 .PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd \
         uninstall uninstall-bin uninstall-etc uninstall-doc \
-        all clean distclean tar $(subdirs)
+        all clean distclean tar $(subdirs) doc
 
 Makefile.settings:
@@ -189 +191 @@
         @echo Hello World
 
+# Check if we can load the helpfile. (This fails if some article is >1KB.)
+# If print returns a NULL pointer, the file is unusable.
+testhelp: doc
+        gdb --eval-command='b main' --eval-command='r' \
+            --eval-command='print help_init(&global->helpfile, "doc/user-guide/help.txt")' \
+            $(OUTFILE) < /dev/null
+
 -include .depend/*.d
 # DO NOT DELETE