Changeset 19214


Ignore:
Timestamp:
09/07/18 11:11:14 (6 years ago)
Author:
tbretz
Message:
Some updates...
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r19210 r19214  
    334334
    335335rootifysql_SOURCES = src/rootifysql.cc
    336 rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la -lmysqlclient
     336rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la libTools.la -lmysqlclient
    337337
    338338makeplots_SOURCES = src/makeplots.cc
    … …  
    385385        libConfiguration.la
    386386
    387 tngweather_SOURCES = src/tngweather.cc src/LocalControl.h
     387tngweather_SOURCES = src/tngweather.cc src/LocalControl.h \
     388        src/ConnectionSSL.h   src/ConnectionSSL.cc
    388389tngweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
    389390        libStateMachine.la libTools.la libTime.la \
    390         libConfiguration.la -lQtXml
     391        libConfiguration.la -lQtXml -lssl -lcrypto
    391392
    392393lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h

  • trunk/FACT++/Makefile.in

    r19210 r19214  
    532532rootifysql_OBJECTS = $(am_rootifysql_OBJECTS)
    533533rootifysql_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    534         libTime.la libConfiguration.la
     534        libTime.la libConfiguration.la libTools.la
    535535sched_SOURCES = sched.c
    536536sched_OBJECTS = sched.$(OBJEXT)
    … …  
    571571timecheck_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    572572        libStateMachine.la libTools.la libTime.la libConfiguration.la
    573 am_tngweather_OBJECTS = src/tngweather.$(OBJEXT)
     573am_tngweather_OBJECTS = src/tngweather.$(OBJEXT) \
     574        src/ConnectionSSL.$(OBJEXT)
    574575tngweather_OBJECTS = $(am_tngweather_OBJECTS)
    575576tngweather_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    … …  
    12531254moon_LDADD = libTime.la libConfiguration.la
    12541255rootifysql_SOURCES = src/rootifysql.cc
    1255 rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la -lmysqlclient
     1256rootifysql_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la libTools.la -lmysqlclient
    12561257makeplots_SOURCES = src/makeplots.cc
    12571258makeplots_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTime.la libConfiguration.la
    … …  
    12981299        libConfiguration.la
    12991300
    1300 tngweather_SOURCES = src/tngweather.cc src/LocalControl.h
     1301tngweather_SOURCES = src/tngweather.cc src/LocalControl.h \
     1302        src/ConnectionSSL.h   src/ConnectionSSL.cc
     1303
    13011304tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \
    13021305        libStateMachine.la libTools.la libTime.la \
    1303         libConfiguration.la -lQtXml
     1306        libConfiguration.la -lQtXml -lssl -lcrypto
    13041307
    13051308lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h
    … …  
    23842387        $(AM_V_CXXLD)$(CXXLINK) $(timecheck_OBJECTS) $(timecheck_LDADD) $(LIBS)
    23852388src/tngweather.$(OBJEXT): src/$(am__dirstamp) \
     2389        src/$(DEPDIR)/$(am__dirstamp)
     2390src/ConnectionSSL.$(OBJEXT): src/$(am__dirstamp) \
    23862391        src/$(DEPDIR)/$(am__dirstamp)
    23872392
    … …  
    26262631@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
    26272632@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
     2633@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ConnectionSSL.Po@am__quote@
    26282634@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ConnectionUSB.Plo@am__quote@
    26292635@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Console.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.