Added documentation install targets

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1029 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/Makefile b/Makefile
index 003dd0c6a561f67c57b154f383449c9dc4e443ff..5a02a6d936a53be4f1fa7b94d9d07682b158f3cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,15 +12,15 @@ srcdir          = .
 include $(srcdir)/Makefile.common
 
 SDCC_MISC      = debugger/mcs51 sim/ucsim
-
 SDCC_LIBS      = support/cpp support/cpp2
+SDCC_DOC        = doc
 
 SDCC_ASLINK    = as/mcs51 as link
 SDCC_PACKIHX   = packihx
 
-TARGETS         = sdcc-libs sdcc-cc sdcc-aslink
+TARGETS         = sdcc-libs sdcc-cc sdcc-aslink sdcc-doc
 
-PKGS           = $(SDCC_LIBS) src $(SDCC_ASLINK)
+PKGS           = $(SDCC_LIBS) src $(SDCC_ASLINK) $(SDCC_DOC)
 
 ifneq ($(OPT_ENABLE_UCSIM), no)
 TARGETS         += sdcc-misc 
@@ -71,6 +71,9 @@ sdcc-device-tini:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib modelDS390
 
+# Empty for now, as doc depends on latex and latex2html
+sdcc-doc:
+
 sdcc: $(TARGETS)
 
 sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx

diff --git a/Makefile.common.in b/Makefile.common.in
index 4f5935f673327c0785eac1982291081940751b5c..fe510cd2cb9d06c870b79388185f18794fa03843 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -32,6 +32,7 @@ man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
+docdir          = @exec_prefix@/doc
 
 # Modules to enable/disable
 OPT_ENABLE_UCSIM = @OPT_ENABLE_UCSIM@

diff --git a/as/Makefile b/as/Makefile
index 67419b989799a1e25af1a2bd8c894b207b50b213..2f583ad0d6ed5884afb36717be1635a62c962785 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -2,6 +2,7 @@ PRJDIR = ..
 include $(PRJDIR)/Makefile.common
 
 PORTS = z80 gbz80
+DOCS = README abstra.doc appendk.txt asmlnk.doc asxhtm.html format.txt
 
 all:
        $(MAKE) -C z80 _as-z80 _as-gbz80 E=$(E) BUILDDIR=../../bin/
@@ -9,9 +10,12 @@ all:
 clean:
        $(MAKE) -C z80 clean
 
-install:
+install: install-doc
        $(INSTALL) $(PRJDIR)/bin/as-z80 `echo $(bindir)/as-z80|sed '$(transform)'`
        $(STRIP) -s `echo $(bindir)/as-z80|sed '$(transform)'`
        $(INSTALL) $(PRJDIR)/bin/as-gbz80 `echo $(bindir)/as-gbz80|sed '$(transform)'`
        $(STRIP) -s `echo $(bindir)/as-gbz80|sed '$(transform)'`
 
+install-doc:
+       $(INSTALL) -d $(docdir)/aslink
+       cp -f `find doc -maxdepth 1 -not -type d` $(docdir)/aslink

diff --git a/doc/Makefile b/doc/Makefile
index 34bfa00b3d39c3dae1d0d8977d2efd2762c1272f..ccfb08be35ec609114a7e8f108e64d7715a1b88f 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,8 @@
 # Very simple Makefile for converting the design doc into something useful.
+TOPDIR = ..
+
+include $(TOPDIR)/Makefile.common
+
 TEX = latex
 
 S = test_suite_spec.tex
@@ -17,5 +21,9 @@ all: $(PS) $(PDF) $(HTML)
 %.html: %.tex
        latex2html -no_subdir -split 0 $<
 
+install:
+       $(INSTALL) -d $(docdir)
+       cp -rf *.html SDCCUdoc.* *.txt *.tex z80 avr $(docdir)
+
 clean:
        rm -f $(PS) $(PDF) *.log *.aux *~

diff --git a/support/cpp2/configargs.h b/support/cpp2/configargs.h
index c2ebbc1a35d2a4a63ba0aeee582c03e9799c803d..64d3c548d61df018e33b50448610e8f904c5ea95 100644 (file)
--- a/support/cpp2/configargs.h
+++ b/support/cpp2/configargs.h
@@ -1,3 +1,3 @@
 /* Generated automatically. */
-static const char configuration_arguments[] = " : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured) ";
+static const char configuration_arguments[] = " : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured) ";
 static const char thread_model[] = "";