Changeset 10194


Ignore:
Timestamp:
Mar 2, 2011, 9:36:41 AM (9 years ago)
Author:
tbretz
Message:
Renamed libDimCpp to libDim++, added Doxyfile to dist to EXTRA_DIST
File:
1 edited

Legend:

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

    r10183 r10194  
    99AM_CPPFLAGS = \
    1010   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    11    -Idim_v19r15/dim $(DIM_FLAGS)
    12 
     11   -Idim_v19r15/dim $(DIM_FLAGS) 
     12   
    1313AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
    1414
     
    2323        -lmysqlpp
    2424
     25#$(man3_MANS): doxygen-doc
     26#DX_CLEANFILES = everything to clean.
     27# Add to MOSTLYCLEANFILES.
     28
    2529#-------------------------------------------------------------------------
    2630
    2731bin_PROGRAMS    = dns did log logtime argv time test3 dclient5 dserver2
    2832
    29 lib_LTLIBRARIES = libDim.la libDimCpp.la libTime.la libTools.la \
     33lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
    3034                  libConfiguration.la libStateMachine.la
    3135
     
    3539
    3640EXTRA_DIST = \
     41        Doxyfile \
    3742        dim_v19r15/DIM_Performance.pdf \
    3843        dim_v19r15/LICENSE.GPL \
     
    8590
    8691#libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
    87 libDimCpp_ladir =
    88 libDimCpp_la_HEADERS = \
     92libDim___ladir =
     93libDim___la_HEADERS = \
    8994        dim_v19r15/dim/dic.hxx \
    9095        dim_v19r15/dim/dim_core.hxx \
     
    95100        dim_v19r15/dim/tokenstring.hxx
    96101       
    97 libDimCpp_la_SOURCES = \
     102libDim___la_SOURCES = \
    98103        dim_v19r15/src/diccpp.cxx \
    99104        dim_v19r15/src/dimcpp.cxx \
     
    130135
    131136dserver2_SOURCES = src/dserver2.cc
    132 dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDimCpp.la
     137dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    133138
    134139
    135140log_SOURCES = src/log.cc
    136 log_LDADD   = libTime.la libTools.la libDim.la libDimCpp.la libStateMachine.la
     141log_LDADD   = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la
    137142
    138143
    139 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la
     144logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
    140145logtime_SOURCES = src/logtime.cc
    141146
    142147
    143148dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc
    144 dclient5_LDADD   = libDim.la libDimCpp.la libTools.la libTime.la libStateMachine.la \
     149dclient5_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    145150    libConfiguration.la
    146151
     
    151156
    152157test3_SOURCES = src/test3.cc src/RemoteControl.cc
    153 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la libConfiguration.la
     158test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    154159
    155160
     
    166171#                       $(pkg_verbose)cp $(srcdir)/foo.in $@
    167172
     173#$(MyAnalysisDS): $(MyAnalysisH) $(MyAnalysisL)
     174#       $(ROOTCINT) -f $@ -c -I$(top_builddir)/config $(INCLUDES) $^
     175#       rootcint_files=`echo $@ | sed -ne 's/\(.*\)\..*/\1.cxx \1.h/p'` && \
     176#        $(top_srcdir)/config/runsed $(top_srcdir)/config/rootcint.sed $$rootcint_files && \
     177#        for i in $$rootcint_files; do \
     178#          if test ! `diff $$i $(srcdir)/$$i >/dev/null 2>&1`; then \
     179#            cp $$i $(srcdir)/; \
     180#          fi; \
     181#        done
     182
Note: See TracChangeset for help on using the changeset viewer.