[Gcx-discussion] gcx/docs Makefile.am,1.2,1.3

[Matei C. <cm...@us...>]

Update of /cvsroot/gcx/gcx/docs
In directory vz-cvs-4.sog:/tmp/cvs-serv15789/docs

Modified Files:
	Makefile.am 
Log Message:
Makefile tweaks, explicit dependency on zlib (thanks Riccardo), some GTK API updates 
which I apparently never commited.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/gcx/gcx/docs/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	28 Feb 2010 04:06:24 -0000	1.2
--- Makefile.am	26 Jul 2011 08:41:54 -0000	1.3
***************
*** 1,11 ****
  
  PICTS	= aucyg-res-std.gpl aucyg-wres-std.gpl v-res-mag-zponly.gpl v-se-color.gpl \
  	  v-se-color-zponly.gpl zp-am-1.gpl zp-am-2.gpl zp-t-1.gpl zp-t-2.gpl
  
! EPSPICT	= $(PICTS:.gpl=.eps)
! PDFPICT = $(PICTS:.gpl=.pdf)
  
  
! EXTRA_DIST	= Makefile.in gcx.ltx gpl2eps.gp $(PICTS) \
  		  html gcx.pdf gcx.dvi gcx.1
  
--- 1,15 ----
  
+ # The pre-compiled documentation is included in the dist, so you don't
+ # need latex et. all installed to build it.
+ 
  PICTS	= aucyg-res-std.gpl aucyg-wres-std.gpl v-res-mag-zponly.gpl v-se-color.gpl \
  	  v-se-color-zponly.gpl zp-am-1.gpl zp-am-2.gpl zp-t-1.gpl zp-t-2.gpl
  
! BASEPICTS = $(PICTS:.gpl=)
! EPS_PICTS = $(PICTS:.gpl=.eps)
! PDF_PICTS = $(PICTS:.gpl=.pdf)
  
  
! EXTRA_DIST	= gcx.ltx gpl2eps.gp $(PICTS) \
  		  html gcx.pdf gcx.dvi gcx.1
  
***************
*** 13,58 ****
  doc_DATA	= gcx.pdf gcx.dvi
  
! htmldir		= $(docdir)/html
  
! all-local: gcx.pdf gcx.dvi gcx.html
  
  install-data-hook:
! 	$(MKDIR_P) $(htmldir)
! 	$(INSTALL_DATA) html/* $(htmldir)
  
! .gpl.eps:
! 	gnuplot gpl2eps.gp $^ > $@
  
! .gpl.pdf:
! 	gnuplot gpl2eps.gp $^ | epstopdf -f > $@
  
! pictures: $(EPSPICT) $(PDFPICT)
! 	touch pictures
  
- options: ../src/gcx
- 	../src/gcx --options-doc >options.ltx
- 	echo '\begin{verbatim}' >cmdline.txt
- 	../src/gcx --help 2>>cmdline.txt
- 	echo '\end{verbatim}' >>cmdline.txt
- 	echo '\begin{verbatim}' >repconv.txt
- 	../src/gcx --help-rep-conv >>repconv.txt
- 	echo '\end{verbatim}' >>repconv.txt
- 	touch options
  
! gcx.pdf: gcx.ltx options pictures
! 	pdflatex gcx.ltx
  
! gcx.dvi: gcx.ltx options pictures
! 	latex gcx.ltx 
  
! gcx.html: gcx.ltx options pictures
! 	latex2html --split=3 --dir html --mkdir gcx.ltx
! 	touch gcx.html
  
! clean:
! 	rm -f *~ *.aux *.toc *.log *.eps *.dvi *.pdf
! 	rm -f gcx.html options pictures
! 	rm -rf html
  
! distclean: clean
  
--- 17,75 ----
  doc_DATA	= gcx.pdf gcx.dvi
  
! OPTFILES	= options.ltx cmdline.txt repconv.txt
  
! # slow and safe
! .NOTPARALLEL:
! 
! all-local: gcx.dvi gcx.pdf html/index.html
  
+ # use html from build-dir (e.g. distcheck alternate dir compilation)
+ # if available, or fallback to srcdir
  install-data-hook:
! 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
! 	if test -d html; then 							\
! 		$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html ;		\
! 	else									\
! 		$(INSTALL_DATA) $(srcdir)/html/* $(DESTDIR)$(docdir)/html ; 	\
! 	fi
  
! uninstall-hook:
! 	( cd $(DESTDIR)$(docdir) && rm -rf html )
  
! define do_extras
! 	../src/gcx --options-doc > options.ltx
! 	-echo '\begin{verbatim}' > cmdline.txt
! 	../src/gcx --help 2>> cmdline.txt
! 	-echo '\end{verbatim}' >> cmdline.txt
! 	-echo '\begin{verbatim}' > repconv.txt
! 	../src/gcx --help-rep-conv >> repconv.txt
! 	-echo '\end{verbatim}' >> repconv.txt
  
! 	for f in $(BASEPICTS); do 					\
! 		gnuplot $(srcdir)/gpl2eps.gp $$f.gpl > $$f.eps ;	\
! 		epstopdf $$f.eps > $$f.pdf ;				\
! 	done
! endef
  
  
! gcx.dvi: gcx.ltx
! 	$(do_extras)
! 	while ( latex $(srcdir)/gcx.ltx ; \
! 	        grep -q "Rerun to get cross-references right" gcx.log ) do true ; \
! 	done
  
! # do these after the .dvi, so we have options, pictures, .aux and .toc
! gcx.pdf: gcx.ltx gcx.dvi
! 	pdflatex $(srcdir)/gcx.ltx
  
! html/index.html: gcx.ltx gcx.dvi
! 	latex2html --split=3 --dir html --mkdir $(srcdir)/gcx.ltx
  
! clean-local:
! 	rm -f *~ *.aux *.toc *.log $(OPTFILES) $(EPS_PICTS) $(PDF_PICTS)
  
! distclean-local: clean-local
! 
! realclean:
! 	rm -rf gcx.dvi gcx.pdf html