Changeset 10404


Ignore:
Timestamp:
Apr 18, 2011, 5:44:08 PM (9 years ago)
Author:
tbretz
Message:
Added the fact gui and QT4 support.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.am

    r10362 r10404  
    55ACLOCAL_AMFLAGS = -I .macro_dir
    66
    7 DIM_FLAGS   = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
    8 BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
     7DIM_FLAGS    = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
     8BOOST_FLAGS  = -DBOOST_DISABLE_ASSERTS
    99
    1010AM_CPPFLAGS = \
     
    1212   -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
    1313
    14 AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
     14AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
     15   -Woverloaded-virtual -Wshadow -std=c++0x
    1516
    1617# -no-undefined
    17 AM_LDFLAGS = -module -avoid-version
     18AM_LDFLAGS = $(QT4_LIB) $(QT4_LDFLAGS) \
     19   -module -avoid-version
    1820
    1921#$(man3_MANS): doxygen-doc
     
    2325#-------------------------------------------------------------------------
    2426
    25 bin_PROGRAMS = \
     27if HAS_QT4
     28QT4_EXECUTABLES = fact
     29endif
     30
     31
     32bin_PROGRAMS = $(QT4_EXECUTABLES) \
    2633        dns did \
    27         log logtime argv time \
    28         test3 dclient5 dserver2 dataLogger
     34        log logtime time argv \
     35        test3 dclient5 dserver2 \
     36        dataLogger
    2937#       sched astro test ftm ftmctrl
    3038
     
    107115        dim/dim/sllist.hxx \
    108116        dim/dim/tokenstring.hxx
    109        
     117
    110118libDim___la_SOURCES = \
    111119        dim/src/diccpp.cxx \
     
    125133        src/EventImp.h        src/EventImp.cc \
    126134        src/Event.h           src/Event.cc \
     135        src/State.h           src/State.cc \
    127136        src/Description.h     src/Description.cc \
    128137        src/MessageImp.h      src/MessageImp.cc \
     
    132141        \
    133142        src/EventDim.h \
    134         src/MessageDim.h      src/MessageDim.cc \
    135         src/StateMachineDim.h src/StateMachineDim.cc \
    136         src/ServiceList.h     src/ServiceList.cc \
     143        src/MessageDim.h         src/MessageDim.cc \
     144        src/StateMachineDim.h    src/StateMachineDim.cc \
     145        src/DimServerList.h      src/DimServerList.cc \
     146        src/DimServiceInfoList.h src/DimServiceInfoList.cc \
     147        src/DimNetworkList.h     src/DimNetwork.cc \
     148        src/ServiceList.h        src/ServiceList.cc \
    137149        src/DimErrorRedirecter.h  \
    138150        src/DimErrorRedirecter.cc \
     
    165177
    166178
     179#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
     180#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
     181
     182
    167183dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
    168184dclient5_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     
    173189#    libConfiguration.la
    174190
    175 #sched_SOURCES = src/sched.cc src/LocalControl.cc src/LocalControl.h
    176 #sched_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    177 #    libConfiguration.la
    178 
    179191
    180192argv_SOURCES = src/argv.cc
     
    186198
    187199
     200#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
     201#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     202
     203
    188204time_SOURCES = src/time.cc
    189205time_LDADD = libTime.la
     
    195211#test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    196212
    197 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
     213dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
    198214dataLogger_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    199215    libConfiguration.la
    200216
     217#fitsgrep_SOURCES = src/fitsgrep.cc
     218#fitsgrep_LDADD   = libConfiguration.la
     219
     220# -----
     221
     222if HAS_QT4
     223DIALOGS = \
     224        gui/design.ui
     225
     226QT_SOURCES = \
     227        gui/HtmlDelegate.cc \
     228        gui/CheckBoxDelegate.cc \
     229        gui/DockWindow.cc \
     230        gui/MainWindow.cc
     231endif
     232
     233BUILT_SOURCES = $(DIALOGS:.ui=.h) $(QT_SOURCES:.cc=.moc.cc)
     234               
     235CLEANFILES += $(BUILT_SOURCES)
     236
     237fact_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
     238fact_SOURCES = $(BUILT_SOURCES) $(DIALOGS) $(QT_SOURCES) \
     239        gui/fact.cc gui/FactGui.cc
     240
     241
     242#-------------------------------------------------------------------------
     243
     244SUFFIXES = .moc.cc
     245
     246.ui.h: $<
     247        $(AM_V_GEN)$(UIC4) $< -o $@
     248
     249.h.moc.cc:
     250        $(AM_V_GEN)$(MOC4) $(EXTRA_CPPFLAGS) $< -o $@
     251
     252.qrc.qrc.cc:
     253        $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
     254
     255
    201256#-------------------------------------------------------------------------
    202257
     
    206261
    207262.man.html: $<
    208         $(AM_V_GEN)groff -mandoc `man -w ./$<` -T html > $@
     263        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
    209264
    210265MAN_TARGETS += $(dist_man1_MANS:.man=.html)
     
    213268if HAS_PS2PDF
    214269.man.pdf: $<
    215         $(AM_V_GEN)groff -mandoc `man -w ./$<` | ps2pdf - $@
     270        $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    216271
    217272MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
     
    234289        @svn diff | $(COLORDIFF)
    235290
     291#-------------------------------------------------------------------------
    236292
    237293# Overwrite rules for silent or other verbosity levels
     
    250306#        done
    251307
     308#CLEANFILES = *~ *.rej *.orig
     309#MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
     310#        stamp-h.in stamp-h[0-9].in
     311#DISTCLEANFILES = config.cache config.log
Note: See TracChangeset for help on using the changeset viewer.