From: Kevin M. Rosenberg Date: Wed, 1 May 2002 13:55:08 +0000 (+0000) Subject: r1851: *** empty log message *** X-Git-Tag: debian-4.5.3-3~324 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=6f325aa773d969b0393775c22e4a281885fbbea2 r1851: *** empty log message *** --- diff --git a/Makefile.am b/Makefile.am index 09164f7..dfad14c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ else EXTRA_DIRS3= endif -SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include $(EXTRA_DIRS3) tools helical +SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) man doc libctsupport libctsim html cgi-bin include $(EXTRA_DIRS3) tools helical EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp diff --git a/debian/ctsim.doc-base b/debian/ctsim.doc-base index 802117b..1956ff5 100644 --- a/debian/ctsim.doc-base +++ b/debian/ctsim.doc-base @@ -5,8 +5,8 @@ Abstract: Describes the use the CTSim Computed Tomography Simulator Section: math -Format: postscript -Files: /usr/share/doc/ctsim/ctsim.ps.gz +# Format: postscript +# Files: /usr/share/doc/ctsim/ctsim.ps.gz Format: HTML Index: /usr/share/doc/ctsim/html/index.html diff --git a/debian/rules b/debian/rules index 432e18a..b1370c9 100755 --- a/debian/rules +++ b/debian/rules @@ -56,6 +56,7 @@ install: build # Add here commands to install the package into debian/ctsim. # install ${INSTALLDIRFLAGS} ${MAKE} install + cp -a doc/html $(DESTDIR)/usr/share/doc/${PKG} # Build architecture-independent files here. binary-indep: build install diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 684a333..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -docs=ctsim.tex ctsim.bib texhelp.sty psbox.tex logo.eps logo.gif \ -ctsim-sgp.tex ctsim-concepts.tex ctsim-gui.tex ctsim-install.tex \ -ctsim-textui.tex ctsim-web.tex \ -alphacalc.eps alphacalc.gif divergent.eps divergent.gif \ -equiangular.eps equiangular.gif equilinear.eps equilinear.gif \ -scangeometry.eps scangeometry.gif \ -tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty \ -mysober.sty fancyhea.sty ctsim.bib ctsim-latex.bib ctsim-tex2rtf.bib - -EXTRA_DIST = ${docs} ctsim.htb - -ps: ctsim.ps -ctsim.ps: ctsim.dvi - dvips ctsim - -dvi: ctsim.dvi -ctsim.dvi: $(docs) - cp ctsim-latex.bib ctsim.bib - latex ctsim - bibtex ctsim - latex ctsim - makeindex ctsim - latex ctsim - -winhelp: $(docs) - rm -f ctsim.rtf ctsim.cnt - cp ctsim-tex2rtf.bib ctsim.bib - tex2rtf ctsim.tex ctsim.rtf -winhelp - hcw /c /m /e ctsim.hpj - mv CTSIM.HLP ctsim.hlp - cp ctsim.hlp ctsim.cnt ../msvc/ctsim/ - -htmlhelp: ctsim.tex - rm -f ctsim*.html ctsim.hhp ctsim.hhc ctsim.hhk ctsim.zip - cp ctsim-tex2rtf.bib ctsim.bib - tex2rtf ctsim.tex ctsim.html -html - zip ctsim.zip *.html *.gif ctsim.hhp ctsim.hhc ctsim.hhk - mv ctsim.zip ctsim.htb - cp ctsim.htb ../msvc/ctsim/. - cp ctsim.htb ../src/. - -html: $(docs) - rm -f ctsim*.html ctsim.hhp ctsim.hhc ctsim.hhk ctsim.zip - cp ctsim-tex2rtf.bib ctsim.bib - tex2rtf ctsim.tex ctsim.html -html - rm -rf html - mkdir html - ln -s ctsim_contents.html html/index.html - mv *.html *.gif html diff --git a/doc/ctsim.htb b/doc/ctsim.htb index 6ad0717..07fd1d5 100644 Binary files a/doc/ctsim.htb and b/doc/ctsim.htb differ diff --git a/man/Makefile.in b/man/Makefile.in index 59d867b..f4a489d 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -90,7 +90,7 @@ wxcflags = @wxcflags@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ -man_MANS = pjrec.1 phm2pj.1 phm2if.1 ifexport.1 ifinfo.1 if1.1 if2.1 pjinfo.1 ifinfo.1 pj2if.1 ctsim.1 +man_MANS = pjrec.1 phm2pj.1 phm2if.1 ifexport.1 ifinfo.1 if1.1 if2.1 pjinfo.1 ifinfo.1 pj2if.1 ctsim.1 ctsimtext.1 phm2helix.1 EXTRA_DIST = $(man_MANS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/tools/Makefile.in b/tools/Makefile.in index 5730fc5..dd73608 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -91,7 +91,6 @@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ bin_PROGRAMS = @lamprograms@ ctsimtext -bin_SCRIPTS = sample-ctsim.sh EXTRA_PROGRAMS = ctsimtext-lam INCLUDES = @my_includes@ @HAVE_SGP_TRUE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a @@ -126,8 +125,6 @@ ctsimtext_OBJECTS = ctsimtext.o if1.o if2.o ifinfo.o ifexport.o \ phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o nographics.o phm2helix.o \ pjHinterp.o ctsimtext_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) - CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -203,25 +200,6 @@ maintainer-clean-compile: ctsimtext: $(ctsimtext_OBJECTS) $(ctsimtext_DEPENDENCIES) @rm -f ctsimtext $(CXXLINK) $(ctsimtext_LDFLAGS) $(ctsimtext_OBJECTS) $(ctsimtext_LDADD) $(LIBS) - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done .cpp.o: $(CXXCOMPILE) -c $< @@ -333,7 +311,7 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-exec-am: install-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-exec: install-exec-am @@ -344,14 +322,14 @@ install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS +uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-am: Makefile $(PROGRAMS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: @@ -390,43 +368,32 @@ maintainer-clean: maintainer-clean-am .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean install-exec-hook: - rm -f $(bindir)/if1 - rm -f $(bindir)/if2 - rm -f $(bindir)/ifexport - rm -f $(bindir)/ifinfo - rm -f $(bindir)/phm2if - rm -f $(bindir)/phm2pj - rm -f $(bindir)/phm2helix - rm -f $(bindir)/pj2if - rm -f $(bindir)/pjinfo - rm -f $(bindir)/pjrec - ln -s $(bindir)/ctsimtext $(bindir)/if1 - ln -s $(bindir)/ctsimtext $(bindir)/if2 - ln -s $(bindir)/ctsimtext $(bindir)/ifexport - ln -s $(bindir)/ctsimtext $(bindir)/ifinfo - ln -s $(bindir)/ctsimtext $(bindir)/phm2if - ln -s $(bindir)/ctsimtext $(bindir)/phm2pj - ln -s $(bindir)/ctsimtext $(bindir)/phm2helix - ln -s $(bindir)/ctsimtext $(bindir)/pj2if - ln -s $(bindir)/ctsimtext $(bindir)/pjinfo - ln -s $(bindir)/ctsimtext $(bindir)/pjrec + ln -sf ctsimtext $(bindir)/if1 + ln -sf ctsimtext $(bindir)/if2 + ln -sf ctsimtext $(bindir)/ifexport + ln -sf ctsimtext $(bindir)/ifinfo + ln -sf ctsimtext $(bindir)/phm2if + ln -sf ctsimtext $(bindir)/phm2pj + ln -sf ctsimtext $(bindir)/phm2helix + ln -sf ctsimtext $(bindir)/pj2if + ln -sf ctsimtext $(bindir)/pjinfo + ln -sf ctsimtext $(bindir)/pjrec realclean: rm -f *.pgm *.if *~ *.pj -@USE_LAM_TRUE@ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a +@USE_LAM_TRUE@ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a @USE_LAM_TRUE@ $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI -DNO_MAIN ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp -o ctsimtext-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ # Tell versions [3.59,3.63) of GNU make to not export all variables.