Changeset 18951 for trunk

Timestamp:

03/05/18 14:53:38 (7 years ago)

Author:

tbretz

Message:

On Ubuntu 16.04 rootifysql requires that the libmysqlclient is explicitly linked -- why? I don't know.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (9 diffs)

trunk/FACT++/Makefile.am

@@ -333 +333 @@
 
 rootifysql_SOURCES = src/rootifysql.cc
-rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
+rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la -lmysqlclient
 
 makeplots_SOURCES = src/makeplots.cc

trunk/FACT++/Makefile.in

@@ -101 +101 @@
         sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) magicweather$(EXEEXT) \
         magiclidar$(EXEEXT) smartfact$(EXEEXT) evtserver$(EXEEXT) \
-        getevent$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
-        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
-        fitsselect$(EXEEXT) zfits$(EXEEXT) $(am__EXEEXT_1) \
-        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
-        $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
-        $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10)
+        getevent$(EXEEXT) temperature$(EXEEXT) biastemp$(EXEEXT) \
+        timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
+        fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \
+        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+        $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+        $(am__EXEEXT_10)
 @HAS_FITS_TRUE@am__append_1 = datalogger
 @HAS_V8_TRUE@am__append_2 = dimctrl dimserver
@@ -304 +305 @@
 biasctrl_OBJECTS = $(am_biasctrl_OBJECTS)
 biasctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_biastemp_OBJECTS = src/biastemp.$(OBJEXT)
+biastemp_OBJECTS = $(am_biastemp_OBJECTS)
+biastemp_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_chatclient_OBJECTS = src/chatclient.$(OBJEXT)
@@ -664 +669 @@
         $(libTime_la_SOURCES) $(libTools_la_SOURCES) \
         $(agilentctrl_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
-        $(cosyctrl_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
-        $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
-        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
-        $(evtserver_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
-        $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitscheck_SOURCES) \
-        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
-        $(fitsselect_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
-        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
-        $(getevent_SOURCES) $(gpsctrl_SOURCES) $(lidctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
-        $(magicweather_SOURCES) $(makedata_SOURCES) \
-        $(makeplots_SOURCES) $(makeschedule_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
+        $(biasctrl_SOURCES) $(biastemp_SOURCES) $(chatclient_SOURCES) \
+        $(chatserv_SOURCES) $(cosyctrl_SOURCES) $(datalogger_SOURCES) \
+        $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
+        $(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
+        $(dserver2_SOURCES) $(evtserver_SOURCES) $(fact_SOURCES) \
+        $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
+        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
+        $(fitsloader_SOURCES) $(fitsselect_SOURCES) $(fsc_SOURCES) \
+        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
+        $(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
+        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
+        $(makedata_SOURCES) $(makeplots_SOURCES) \
+        $(makeschedule_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
         $(rootifysql_SOURCES) sched.c $(scheduler_SOURCES) \
@@ -690 +696 @@
         $(libTime_la_SOURCES) $(libTools_la_SOURCES) \
         $(agilentctrl_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
-        $(cosyctrl_SOURCES) $(am__datalogger_SOURCES_DIST) \
-        $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
-        $(dimserver_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
-        $(dserver2_SOURCES) $(evtserver_SOURCES) \
-        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
+        $(biasctrl_SOURCES) $(biastemp_SOURCES) $(chatclient_SOURCES) \
+        $(chatserv_SOURCES) $(cosyctrl_SOURCES) \
+        $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
+        $(did_SOURCES) $(dimctrl_SOURCES) $(dimserver_SOURCES) \
+        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
+        $(evtserver_SOURCES) $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
         $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
         $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
@@ -1037 +1043 @@
 @HAS_HELP2MAN_TRUE@dist_man1_MANS = \
 @HAS_HELP2MAN_TRUE@     biasctrl.man \
+@HAS_HELP2MAN_TRUE@     biastemp.man \
 @HAS_HELP2MAN_TRUE@     datalogger.man \
 @HAS_HELP2MAN_TRUE@     dimctrl.man \
@@ -1241 +1248 @@
 moon_LDADD = libTime.la libConfiguration.la
 rootifysql_SOURCES = src/rootifysql.cc
-rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
+rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la -lmysqlclient
 makeplots_SOURCES = src/makeplots.cc
 makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
@@ -1310 +1317 @@
        libStateMachine.la libTools.la libTime.la \
        libConfiguration.la
+
+biastemp_SOURCES = src/biastemp.cc src/LocalControl.h
+biastemp_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
 
 temperature_SOURCES = src/temperature.cc src/LocalControl.h
@@ -1975 +1987 @@
         @rm -f biasctrl$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(biasctrl_OBJECTS) $(biasctrl_LDADD) $(LIBS)
+src/biastemp.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+
+biastemp$(EXEEXT): $(biastemp_OBJECTS) $(biastemp_DEPENDENCIES) $(EXTRA_biastemp_DEPENDENCIES) 
+        @rm -f biastemp$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(biastemp_OBJECTS) $(biastemp_LDADD) $(LIBS)
 src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -2638 +2656 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biastemp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@