Changeset 18120

Timestamp:

02/12/15 15:28:28 (10 years ago)

Author:

tbretz

Message:

Added fitsselect

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (28 diffs)

trunk/FACT++/Makefile.am

@@ -46 +46 @@
         timecheck \
         showlog \
-        fitsdump fitscheck \
+        fitsdump fitscheck fitsselect \
         zfits
 
@@ -106 +106 @@
         fitsdump.man \
         fitscheck.man \
+        fitsselect.man \
         fscctrl.man \
         ftmctrl.man \
@@ -473 +474 @@
 fitscheck_LDADD   = libConfiguration.la
 
+fitsselect_SOURCES = src/fitsselect.cc 
+fitsselect_LDADD   = libConfiguration.la
+
 
 readfits_SOURCES = src/readfits.cc src/ReadFits.h

trunk/FACT++/Makefile.in

@@ -15 +15 @@
 
 @SET_MAKE@
-
-#include aminclude.am
-
-#-------------------------------------------------------------------------
 
 
@@ -42 +38 @@
 build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
+        $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \
+        $(libDim_la_HEADERS) $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in $(srcdir)/aminclude.am \
+        $(top_srcdir)/configure .aux_dir/compile .aux_dir/config.guess \
+        .aux_dir/config.sub .aux_dir/depcomp .aux_dir/install-sh \
+        .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
+        INSTALL NEWS
 bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
         time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
@@ -51 +55 @@
         tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
         pwrctrl$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
-        smartfact$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
-        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
+        smartfact$(EXEEXT) evtserver$(EXEEXT) getevent$(EXEEXT) \
+        temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
+        fitsdump$(EXEEXT) fitscheck$(EXEEXT) fitsselect$(EXEEXT) \
         zfits$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
         $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
@@ -85 +90 @@
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
-        $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \
-        $(libDim_la_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(top_srcdir)/configure .aux_dir/compile \
-        .aux_dir/config.guess .aux_dir/config.sub .aux_dir/depcomp \
-        .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \
-        AUTHORS COPYING ChangeLog INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_class.m4 \
@@ -266 +264 @@
 dserver2_OBJECTS = $(am_dserver2_OBJECTS)
 dserver2_DEPENDENCIES = libTime.la libTools.la
+am_evtserver_OBJECTS = src/evtserver.$(OBJEXT)
+evtserver_OBJECTS = $(am_evtserver_OBJECTS)
+evtserver_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am__fact_SOURCES_DIST = gui/design.h gui/design.cc \
         gui/DockWindow.moc.cc gui/MainWindow.moc.cc \
@@ -334 +336 @@
 fitsloader_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
         libDim++.la libDim.la libConfiguration.la
+am_fitsselect_OBJECTS = src/fitsselect.$(OBJEXT)
+fitsselect_OBJECTS = $(am_fitsselect_OBJECTS)
+fitsselect_DEPENDENCIES = libConfiguration.la
 am_fsc_OBJECTS = src/fsc.$(OBJEXT)
 fsc_OBJECTS = $(am_fsc_OBJECTS)
@@ -353 +358 @@
 gcn_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_getevent_OBJECTS = src/getevent.$(OBJEXT)
+getevent_OBJECTS = $(am_getevent_OBJECTS)
+getevent_DEPENDENCIES = libTools.la libTime.la libConfiguration.la
 am_gpsctrl_OBJECTS = src/gpsctrl.$(OBJEXT)
 gpsctrl_OBJECTS = $(am_gpsctrl_OBJECTS)
@@ -537 +545 @@
         $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
         $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
-        $(fact_SOURCES) $(fad_SOURCES) $(fadctrl_SOURCES) \
-        $(feedback_SOURCES) $(fitscheck_SOURCES) $(fitsdump_SOURCES) \
-        fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
-        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-        $(gcn_SOURCES) $(gpsctrl_SOURCES) $(lidctrl_SOURCES) \
+        $(evtserver_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
+        $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitscheck_SOURCES) \
+        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
+        $(fitsselect_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
+        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
+        $(getevent_SOURCES) $(gpsctrl_SOURCES) $(lidctrl_SOURCES) \
         $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
         $(magicweather_SOURCES) $(makedata_SOURCES) \
@@ -560 +569 @@
         $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
         $(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
-        $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
+        $(dserver2_SOURCES) $(evtserver_SOURCES) \
+        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
         $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
         $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
-        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
-        $(gpsctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) $(magiclidar_SOURCES) \
-        $(magicweather_SOURCES) $(makedata_SOURCES) \
-        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
-        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
-        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \
-        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(fitsloader_SOURCES) $(fitsselect_SOURCES) $(fsc_SOURCES) \
+        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
+        $(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
+        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
+        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
+        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
+        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
+        $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \
+        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
+        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
         $(webDid_SOURCES) $(zfits_SOURCES)
@@ -809 +819 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
+@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
+@DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
+@DX_COND_doc_TRUE@@DX_COND_man_TRUE@DX_CLEAN_MAN = @DX_DOCDIR@/man
+@DX_COND_doc_TRUE@@DX_COND_rtf_TRUE@DX_CLEAN_RTF = @DX_DOCDIR@/rtf
+@DX_COND_doc_TRUE@@DX_COND_xml_TRUE@DX_CLEAN_XML = @DX_DOCDIR@/xml
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_PS_GOAL = doxygen-ps
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_PDF_GOAL = doxygen-pdf
+@DX_COND_doc_TRUE@@DX_COND_latex_TRUE@DX_CLEAN_LATEX = @DX_DOCDIR@/latex
+@DX_COND_doc_TRUE@DX_CLEANFILES = \
+@DX_COND_doc_TRUE@    @DX_DOCDIR@/@PACKAGE@.tag \
+@DX_COND_doc_TRUE@    -r \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_HTML) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_CHM) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_CHI) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_MAN) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_RTF) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_XML) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_PS) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_PDF) \
+@DX_COND_doc_TRUE@    $(DX_CLEAN_LATEX)
+
+
+#-------------------------------------------------------------------------
 ACLOCAL_AMFLAGS = -I .macro_dir
 SVN_REVISION = -DREVISION=\"`svnversion -n .`\"
@@ -838 +874 @@
 @HAS_HELP2MAN_TRUE@     fitsdump.man \
 @HAS_HELP2MAN_TRUE@     fitscheck.man \
+@HAS_HELP2MAN_TRUE@     fitsselect.man \
 @HAS_HELP2MAN_TRUE@     fscctrl.man \
 @HAS_HELP2MAN_TRUE@     ftmctrl.man \
@@ -850 +887 @@
 @HAS_HELP2MAN_TRUE@     showlog.man \
 @HAS_HELP2MAN_TRUE@     smartfact.man \
+@HAS_HELP2MAN_TRUE@     evtserver.man \
+@HAS_HELP2MAN_TRUE@     getevent.man \
 @HAS_HELP2MAN_TRUE@     temperature.man \
 @HAS_HELP2MAN_TRUE@     timecheck.man \
@@ -1063 +1102 @@
         libConfiguration.la
 
+evtserver_SOURCES = src/evtserver.cc src/LocalControl.h
+evtserver_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
+getevent_SOURCES = src/getevent.cc
+getevent_LDADD = libTools.la libTime.la libConfiguration.la
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
         src/EventBuilder.cc src/EventBuilder.h src/DataProcessorImp.cc \
@@ -1151 +1197 @@
 fitscheck_SOURCES = src/fitscheck.cc 
 fitscheck_LDADD = libConfiguration.la
+fitsselect_SOURCES = src/fitsselect.cc 
+fitsselect_LDADD = libConfiguration.la
 readfits_SOURCES = src/readfits.cc src/ReadFits.h
 readfits_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
@@ -1159 +1207 @@
 triggerschedule_SOURCES = src/triggerschedule.cc 
 triggerschedule_LDADD = libDim++.la libDim.la libDimExtension.la libConfiguration.la
-fitsCompressor_SOURCES = src/fitsCompressor.cc 
-fitsCompressor_LDADD = libConfiguration.la
+
+#fitsCompressor_SOURCES = src/fitsCompressor.cc 
+#fitsCompressor_LDADD   = libConfiguration.la
 
 #fitsgrep_SOURCES = src/fitsgrep.cc
@@ -1230 +1279 @@
 am--refresh: Makefile
         @:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/aminclude.am $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -1253 +1302 @@
             cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
         esac;
+$(srcdir)/aminclude.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -1542 +1592 @@
         @rm -f dserver2$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(dserver2_OBJECTS) $(dserver2_LDADD) $(LIBS)
+src/evtserver.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+evtserver$(EXEEXT): $(evtserver_OBJECTS) $(evtserver_DEPENDENCIES) $(EXTRA_evtserver_DEPENDENCIES) 
+        @rm -f evtserver$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(evtserver_OBJECTS) $(evtserver_LDADD) $(LIBS)
 gui/$(am__dirstamp):
         @$(MKDIR_P) gui
@@ -1622 +1677 @@
         @rm -f fitsloader$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(fitsloader_OBJECTS) $(fitsloader_LDADD) $(LIBS)
+src/fitsselect.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+fitsselect$(EXEEXT): $(fitsselect_OBJECTS) $(fitsselect_DEPENDENCIES) $(EXTRA_fitsselect_DEPENDENCIES) 
+        @rm -f fitsselect$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(fitsselect_OBJECTS) $(fitsselect_LDADD) $(LIBS)
 src/fsc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 fsc$(EXEEXT): $(fsc_OBJECTS) $(fsc_DEPENDENCIES) $(EXTRA_fsc_DEPENDENCIES) 
@@ -1644 +1704 @@
         @rm -f gcn$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(gcn_OBJECTS) $(gcn_LDADD) $(LIBS)
+src/getevent.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+getevent$(EXEEXT): $(getevent_OBJECTS) $(getevent_DEPENDENCIES) $(EXTRA_getevent_DEPENDENCIES) 
+        @rm -f getevent$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(getevent_OBJECTS) $(getevent_LDADD) $(LIBS)
 src/gpsctrl.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1969 +2034 @@
         -rm -f src/drivectrl.$(OBJEXT)
         -rm -f src/dserver2.$(OBJEXT)
+        -rm -f src/evtserver.$(OBJEXT)
         -rm -f src/fad.$(OBJEXT)
         -rm -f src/fadctrl.$(OBJEXT)
@@ -1975 +2041 @@
         -rm -f src/fitsdump.$(OBJEXT)
         -rm -f src/fitsloader.$(OBJEXT)
+        -rm -f src/fitsselect.$(OBJEXT)
         -rm -f src/fsc.$(OBJEXT)
         -rm -f src/fscctrl.$(OBJEXT)
@@ -1980 +2047 @@
         -rm -f src/ftmctrl.$(OBJEXT)
         -rm -f src/gcn.$(OBJEXT)
+        -rm -f src/getevent.$(OBJEXT)
         -rm -f src/gpsctrl.$(OBJEXT)
         -rm -f src/lidctrl.$(OBJEXT)
@@ -2118 +2186 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/evtserver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fad.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@
@@ -2124 +2193 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsloader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsselect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fsc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fscctrl.Po@am__quote@
@@ -2129 +2199 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gcn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/getevent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gpsctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@
@@ -2936 +3007 @@
 
 
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     cd @DX_DOCDIR@/latex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(MAKEINDEX_PATH) refman.idx; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     countdown=5; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@               refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     do \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@        $(DX_LATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@        countdown=`expr $$countdown - 1`; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     done; \
+@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
+
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
+
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    cd @DX_DOCDIR@/latex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_MAKEINDEX) refman.idx; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    countdown=5; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    do \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            $(DX_PDFLATEX) refman.tex; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            countdown=`expr $$countdown - 1`; \
+@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            done;
+
+@DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
+
+@DX_COND_doc_TRUE@doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
+@DX_COND_doc_TRUE@@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
+@DX_COND_doc_TRUE@      rm -rf @DX_DOCDIR@
+@DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
+
 .ui.h: $<
         $(AM_V_GEN)$(UIC4) $< -o $@
@@ -2960 +3076 @@
 
 doc: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run
-        @ln -s index.html doxygen-doc/html/main.html
+        @cd doxygen-doc/html
+        @ln -s index.html main.html
+        @mkdir -p pdf
+        @mkdir -p man
+        @cd pdf
+        @ln -sf ../../../*.pdf .
+        @cd ../man
+        @ln -sf ../../../*.html .
+        @cd ../../..
 
 diff: