Changeset 10515 for trunk


Ignore:
Timestamp:
05/02/11 19:10:08 (14 years ago)
Author:
tbretz
Message:
Some updates; tried to fix the deocumentation if's
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r10457 r10515  
    5454#                 libAstro.la
    5555
    56 dist_man1_MANS = test3.man
    57 
    58 #-------------------------------------------------------------------------
     56#-------------------------------------------------------------------------
     57
     58CLEANFILES=
    5959
    6060dist_noinst_SCRIPTS = autogen.sh
    … …  
    7676        dim/README_v18.txt \
    7777        dim/README_v19.txt
    78 
    79 EXTRA_DIST += $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf)
    80 CLEANFILES  = $(dist_man1_MANS:.man=.pdf)  $(dist_man1_MANS:.man=.html)
    8178
    8279dns_LDADD    = libDim.la
    … …  
    183180
    184181log_SOURCES = src/log.cc
    185 log_LDADD   = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la
    186 
    187 
    188 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
     182log_LDADD   = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la
     183
     184
     185logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
    189186logtime_SOURCES = src/logtime.cc
    190187
    191188
    192 #chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
    193 #chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
     189chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
     190chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
    194191
    195192
    196193dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
    197 dclient5_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     194dclient5_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    198195    libConfiguration.la
    199196
    200197ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
    201 ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     198ftmctrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    202199    libConfiguration.la
    203200
    … …  
    208205
    209206test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
    210 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    211 
    212 
    213 #chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
    214 #chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     207test3_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
     208
     209
     210chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
     211chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    215212
    216213
    … …  
    222219
    223220test_SOURCES = src/test.cc
    224 test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     221test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    225222
    226223dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
    227 dataLogger_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     224dataLogger_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    228225    libConfiguration.la
    229226
    … …  
    254251
    255252fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    256         libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
    257        
     253        libDim.la libDim++.la libTools.la libTime.la libTools.la libStateMachine.la \
     254        libConfiguration.la
     255
    258256fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
    259257        gui/fact.cc gui/FactGui.cc
    … …  
    277275
    278276MAN_TARGETS =
    279 
    280 if HAS_GROFF
    281 
    282 .man.html: $<
    283         $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
    284 
    285 MAN_TARGETS += $(dist_man1_MANS:.man=.html)
    286 
    287 
    288 if HAS_PS2PDF
    289 .man.pdf: $<
    290         $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    291 
    292 MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
    293 endif
    294 
    295 endif
    296277
    297278if HAS_HELP2MAN
    … …  
    300281        $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
    301282
    302 MAN_TARGETS += $(dist_man1_MANS)
     283dist_man1_MANS = test3.man
     284MAN_TARGETS   += $(dist_man1_MANS)
     285endif
     286
     287if HAS_GROFF
     288
     289.man.html: $<
     290        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
     291
     292MAN_TARGETS += $(dist_man1_MANS:.man=.html)
     293EXTRA_DIST  += $(dist_man1_MANS:.man=.html)
     294CLEANFILES  += $(dist_man1_MANS:.man=.html)
     295
     296if HAS_PS2PDF
     297.man.pdf: $<
     298        $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
     299
     300MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
     301EXTRA_DIST  += $(dist_man1_MANS:.man=.pdf)
     302CLEANFILES  += $(dist_man1_MANS:.man=.pdf)
     303endif
     304
    303305endif
    304306
    305307man: $(MAN_TARGETS) doxygen-doc
    306 
    307308
    308309diff:
Note: See TracChangeset for help on using the changeset viewer.