Merge branch 'issues/ndn-0002-small-code-corrections'

* issues/ndn-0002-small-code-corrections:
  doc: Incorporating auto-generated man page for ccnd-autoconfig
  build: Updating csrc/cmd/dir.mk and csrc/lib/dir.mk to fix parallel compilation and remove unnecessary rules
  doc+build: Disabling compilation of technical docs, enabling installation of manpages

Refs #2

Author: cawka

Makefile

@@ -1,5 +1,5 @@
 # Top level Makefile for CCNx
-# 
+#
 # Part of the CCNx distribution.
 #
 # Copyright (C) 2009-2012 Palo Alto Research Center, Inc.
@@ -45,6 +45,9 @@ clean depend test check shared testinstall install uninstall html: csrc/conf.mk
 	for i in $(TOPSUBDIRS) javasrc apps; do         \
 	  (cd "$$i" && pwd && $(SUBMAKE) $@) || exit 1;	\
 	done
+	for i in doc/manpages; do \
+	  (cd "$$i" && pwd && $(MAKE) -f ../../csrc/conf.mk -f Makefile $@) || exit 1;  \
+	done
 	@rm -f _always
 
 documentation dist-docs : _always
@@ -100,7 +103,7 @@ distfile: tar
 	ls -l ccnx-$(VERSION).tar.gz
 
 fixupversions: _always
-	Fix1 () { sed -e '/^PROJECT_NUMBER/s/=.*$$/= $(VERSION)/' $$1 > DTemp && mv DTemp $$1; } && Fix1 csrc/Doxyfile && Fix1 csrc/Doxyfile.dist && Fix1 csrc/Doxyfile.latex && Fix1 javasrc/Doxyfile && Fix1 javasrc/Doxyfile.dist && Fix1 javasrc/Doxyfile.latex && Fix1 doc/manpages/Makefile && Fix1 android/Doxyfile && cp android/CCNx-Android-Services/strings.xml.tpl android/CCNx-Android-Services/res/values/strings.xml && sed -e "s/PROJECT_NUMBER/$(VERSION)/g" android/CCNx-Android-Services/strings.xml.tpl > android/CCNx-Android-Services/res/values/strings.xml && Fix1 android/Doxyfile.dist && Fix1 android/Doxyfile.latex 
+	Fix1 () { sed -e '/^PROJECT_NUMBER/s/=.*$$/= $(VERSION)/' $$1 > DTemp && mv DTemp $$1; } && Fix1 csrc/Doxyfile && Fix1 csrc/Doxyfile.dist && Fix1 csrc/Doxyfile.latex && Fix1 javasrc/Doxyfile && Fix1 javasrc/Doxyfile.dist && Fix1 javasrc/Doxyfile.latex && Fix1 doc/manpages/Makefile && Fix1 android/Doxyfile && cp android/CCNx-Android-Services/strings.xml.tpl android/CCNx-Android-Services/res/values/strings.xml && sed -e "s/PROJECT_NUMBER/$(VERSION)/g" android/CCNx-Android-Services/strings.xml.tpl > android/CCNx-Android-Services/res/values/strings.xml && Fix1 android/Doxyfile.dist && Fix1 android/Doxyfile.latex
 
 IGNORELINKS = -e android/CCNx-Android-Services/jni/csrc -e android/CCNx-Android-Services/jni/openssl/openssl-armv5
 MD5: _always

csrc/cmd/dir.mk

@@ -153,30 +153,6 @@ ccnhexdumpdata: ccnhexdumpdata.o
 ccninitkeystore: ccninitkeystore.o
 	$(CC) $(CFLAGS) -o $@ ccninitkeystore.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto
 
-ccn_digest.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_digest.c
-
-ccn_keystore.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_keystore.c
-
-ccn_signing.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_signing.c
-
-ccn_merkle_path_asn1.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_merkle_path_asn1.c
-
-ccn_verifysig.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c ccn_verifysig.c
-
-ccn_verifysig: ccn_verifysig.o
-	$(CC) $(CFLAGS) -o $@ ccn_verifysig.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto
-
-signbenchtest.o:
-	$(CC) $(CFLAGS) $(OPENSSL_CFLAGS) -c signbenchtest.c
-
-signbenchtest: signbenchtest.o
-	$(CC) $(CFLAGS) -o $@ signbenchtest.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto 
-
 ccndumppcap: ccndumppcap.o
 	$(CC) $(CFLAGS) -o $@ ccndumppcap.o $(LDLIBS) $(OPENSSL_LIBS) -lcrypto -lpcap
 

csrc/configure

@@ -58,6 +58,7 @@ ProvideDefault INSTALL_BASE = /usr/local
 ProvideDefault INSTALL_INCLUDE = '$(INSTALL_BASE)/include'
 ProvideDefault INSTALL_LIB = '$(INSTALL_BASE)/lib'
 ProvideDefault INSTALL_BIN = '$(INSTALL_BASE)/bin'
+ProvideDefault INSTALL_MAN = '$(INSTALL_BASE)/man'
 
 ProvideDefault PCAP_PROGRAMS = ccndumppcap
 ProvideDefault RESOLV_LIBS = -lresolv
@@ -83,6 +84,7 @@ cat <<'EOF' >> conf.mk
 DINST_BIN = $(DESTDIR)$(INSTALL_BIN)
 DINST_INC = $(DESTDIR)$(INSTALL_INCLUDE)
 DINST_LIB = $(DESTDIR)$(INSTALL_LIB)
+DINST_MAN = $(DESTDIR)$(INSTALL_MAN)
 EOF
 
 echo ============= conf.mk =============>&2

csrc/lib/dir.mk

@@ -57,6 +57,8 @@ default all: dtag_check lib $(PROGRAMS)
 
 all: ccn_verifysig
 
+$(PROGRAMS) $(DEBRIS): libccn.a
+
 install: install_headers
 install_headers:
 	@test -d $(DINST_INC) || (echo $(DINST_INC) does not exist.  Please mkdir -p $(DINST_INC) if this is what you intended. && exit 2)

doc/manpages/Makefile

@@ -1,5 +1,5 @@
 # doc/manpages/Makefile
-# 
+#
 # Part of the CCNx distribution.
 #
 # Copyright (C) 2010, 2013 Palo Alto Research Center, Inc.
@@ -71,9 +71,9 @@ INDEXED_HTML = $(DERIVED_HTML) $(SRC_HTML)
 default:
 	: To build the documentation: $(MAKE) documentation
 
-documentation: html
+documentation dist-docs: html
 
-all dist-docs: html manpages
+all: manpages
 
 manpages: $(DERIVED_MAN)
 
@@ -88,6 +88,15 @@ clean:
 clean-documentation:
 	rm -f $(NONSOURCE)
 
+install: manpages
+	@test -d $(DINST_MAN)/man1 || (echo $(DINST_MAN)/man1 does not exist.  Please mkdir -p $(DINST_MAN)/man1 if this is what you intended. && exit 2)
+	for i in $(DERIVED_MAN); do \
+           $(INSTALL) -g 0 -o 0 -m 0644 $$i $(DINST_MAN)/man1; \
+	done
+
+uninstall:
+	for i in $(DERIVED_MAN); do test -z "$$i" || $(RM) $(DINST_MAN)/man1/$$i.gz; done
+
 .gitignore: Makefile
 	@for i in $(NONSOURCE); do echo $$i; done > $@
 
@@ -105,7 +114,7 @@ index.txt: $(INDEXED_HTML) .genindex.sh
 	rm -f index.html
 	sh .genindex.sh $(INDEXED_HTML) > index.txt
 
-$(DERIVED_HTML): $(@:.html=.txt) 
+$(DERIVED_HTML): $(@:.html=.txt)
 	asciidoc -a revnumber="$(PROJECT_NUMBER)" -d manpage $(@:.html=.txt)
 
 $(DERIVED_PDF): $(@:.pdf=.txt)