Changeset 18351 for trunk

Timestamp:

11/07/15 17:18:40 (9 years ago)

Author:

tbretz

Message:

Renamed drivectrl to cosyctrl and added the new drivectrl to the Makefile.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (7 diffs)
• src/cosyctrl.cc (moved) (moved from trunk/FACT++/src/drivectrl.cc )

trunk/FACT++/Makefile.am

@@ -10 +10 @@
 BOOST_FLAGS  = -DBOOST_DISABLE_ASSERTS
 
-AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
+AM_CFLAGS   = -pedantic
+AM_CPPFLAGS = -Idim/dim -Ipal -Isofa/src $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    $(SVN_REVISION)
@@ -38 +39 @@
         gcn \
         chatclient chatserv \
-        biasctrl drivectrl agilentctrl \
+        biasctrl drivectrl cosyctrl agilentctrl \
         mcp feedback ratescan ratecontrol \
         tngweather lidctrl gpsctrl pfminictrl sqmctrl pwrctrl \
@@ -92 +93 @@
 lib_LTLIBRARIES = \
         libDim++.la libDim.la libDimExtension.la \
-        libConfiguration.la libStateMachine.la libTime.la libTools.la
-#       libAstro.la
+        libConfiguration.la libStateMachine.la libTime.la libTools.la \
+        libPal.la
 
 if HAS_HELP2MAN
@@ -99 +100 @@
         biasctrl.man \
         datalogger.man \
+        cosyctrl.man \
         dimctrl.man \
         dimserver.man \
@@ -113 +115 @@
         gpsctrl.man \
         lidctrl.man \
+        pfminictrl.man \
+        sqmctrl.man \
         magiclidar.man \
         magicweather.man \
@@ -261 +265 @@
 libTools_la_SOURCES = src/tools.h src/tools.cc
 
+libPal_la_SOURCES = pal/pal.h \
+        pal/palDtt.c            pal/palDat.c            pal/palMappa.c          \
+        pal/palPrenut.c         pal/palEvp.c            pal/palAoppa.c          \
+        pal/palAoppat.c         pal/palRefco.c          pal/palRefro.c          \
+        pal/pal1Atmt.c          pal/palDrange.c         pal/palOne2One.c        \
+        pal/pal1Atms.c          pal/palMapqkz.c         pal/palAopqk.c          \
+        pal/palRefz.c           pal/palAmpqk.c          pal/palRdplan.c         \
+        pal/palDt.c             pal/palPvobs.c          pal/palNut.c            \
+        pal/palDmoon.c          pal/palPlanet.c         pal/palNutc.c           \
+        pal/palDeuler.c \
+        \
+        erfa/src/gd2gc.c        erfa/src/p06e.c         erfa/src/c2s.c          \
+        erfa/src/eform.c        erfa/src/s2c.c          erfa/src/pas.c          \
+        erfa/src/pmat06.c       erfa/src/epv00.c        erfa/src/plan94.c       \
+        erfa/src/anpm.c         erfa/src/obl06.c        erfa/src/dat.c          \
+        erfa/src/af2a.c         erfa/src/rxr.c          erfa/src/gmst06.c       \
+        erfa/src/sepp.c         erfa/src/rz.c           erfa/src/zp.c           \
+        erfa/src/rxpv.c         erfa/src/pn.c           erfa/src/cr.c           \
+        erfa/src/seps.c         erfa/src/ry.c           erfa/src/pdp.c          \
+        erfa/src/pnm06a.c       erfa/src/hfk5z.c        erfa/src/epj2jd.c       \
+        erfa/src/pv2s.c         erfa/src/tf2a.c         erfa/src/pm.c           \
+        erfa/src/sxp.c          erfa/src/a2af.c         erfa/src/rxp.c          \
+        erfa/src/pxp.c          erfa/src/fk5hip.c       erfa/src/fw2m.c         \
+        erfa/src/rx.c           erfa/src/tf2d.c         erfa/src/cal2jd.c       \
+        erfa/src/cp.c           erfa/src/nut06a.c       erfa/src/rm2v.c         \
+        erfa/src/nut00a.c       erfa/src/ee06a.c        erfa/src/fk5hz.c        \
+        erfa/src/epb2jd.c       erfa/src/refco.c        erfa/src/a2tf.c         \
+        erfa/src/fapa03.c       erfa/src/gst06a.c       erfa/src/faf03.c        \
+        erfa/src/faur03.c       erfa/src/faju03.c       erfa/src/fal03.c        \
+        erfa/src/fasa03.c       erfa/src/fame03.c       erfa/src/fave03.c       \
+        erfa/src/fama03.c       erfa/src/faom03.c       erfa/src/gst06.c        \
+        erfa/src/jd2cal.c       erfa/src/gd2gce.c       erfa/src/anp.c          \
+        erfa/src/fae03.c        erfa/src/ir.c           erfa/src/pfw06.c        \
+        erfa/src/bpn2xy.c       erfa/src/eors.c         erfa/src/s06.c          \
+        erfa/src/trxp.c         erfa/src/era00.c        erfa/src/epj.c          \
+        erfa/src/d2tf.c         erfa/src/epb.c          erfa/src/rv2m.c         \
+        erfa/src/pap.c          erfa/src/fad03.c        erfa/src/pmp.c          \
+        erfa/src/tr.c           erfa/src/falp03.c       \
+        \
+        sofa/src/anpm.c         sofa/src/rxr.c          sofa/src/s2c.c          \
+        sofa/src/c2s.c          sofa/src/cr.c           sofa/src/cp.c   
 
 dserver2_SOURCES = src/dserver2.cc 
@@ -306 +351 @@
         libConfiguration.la
 
-drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
+cosyctrl_SOURCES = src/cosyctrl.cc src/LocalControl.h src/HeadersFTM.cc
+cosyctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
+drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h
 drivectrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
-        libConfiguration.la
+        libConfiguration.la libPal.la
 
 agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h