Changeset 13972

Timestamp:

05/30/12 10:53:21 (13 years ago)

Author:

tbretz

Message:

Added skypeclient

File:

• trunk/FACT++/Makefile.in (modified) (17 diffs)

trunk/FACT++/Makefile.in

@@ -49 +49 @@
         drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
         ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
-        tngweather$(EXEEXT) smartfact$(EXEEXT) fitsdump$(EXEEXT) \
-        fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5)
+        smartfact$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
+        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather
-@HAS_VIEWER_TRUE@am__append_3 = viewer
-@HAS_LIBXP_TRUE@am__append_4 = did
+@HAS_DBUS_TRUE@am__append_3 = skypeclient
+@HAS_VIEWER_TRUE@am__append_4 = viewer
+@HAS_LIBXP_TRUE@am__append_5 = did
 
 # This is a trick to be able to build them but not having them in 'all'
-@IS_FALSE@am__append_5 = \
+@IS_FALSE@am__append_6 = \
 @IS_FALSE@      test scheduler \
 @IS_FALSE@      triggerschedule \
@@ -66 +67 @@
 @IS_FALSE@      readfits
 
-@HAS_FITS_TRUE@am__append_6 = src/FitsFile.h src/FitsFile.cc \
+@HAS_FITS_TRUE@am__append_7 = src/FitsFile.h src/FitsFile.cc \
 @HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
 @HAS_FITS_TRUE@ src/DataWriteFits2.cc    src/DataWriteFits2.h
 
-@HAS_FITS_TRUE@am__append_7 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
-@HAS_GROFF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.html) 
+@HAS_FITS_TRUE@am__append_8 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+@HAS_GROFF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.html)
 @HAS_GROFF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) 
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
@@ -175 +176 @@
 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
 @HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT)
-@HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT)
-@HAS_LIBXP_TRUE@am__EXEEXT_4 = did$(EXEEXT)
-@IS_FALSE@am__EXEEXT_5 = test$(EXEEXT) scheduler$(EXEEXT) \
+@HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT)
+@HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT)
+@HAS_LIBXP_TRUE@am__EXEEXT_5 = did$(EXEEXT)
+@IS_FALSE@am__EXEEXT_6 = test$(EXEEXT) scheduler$(EXEEXT) \
 @IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
 @IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
@@ -352 +354 @@
 scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
         libDim++.la libDim.la libDimExtension.la libConfiguration.la
+am_skypeclient_OBJECTS = src/skypeclient.$(OBJEXT)
+skypeclient_OBJECTS = $(am_skypeclient_OBJECTS)
+skypeclient_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+        libDim++.la libDim.la libDimExtension.la libConfiguration.la
 am_smartfact_OBJECTS = src/smartfact.$(OBJEXT) src/PixelMap.$(OBJEXT)
 smartfact_OBJECTS = $(am_smartfact_OBJECTS)
@@ -453 +459 @@
         $(magicweather_SOURCES) $(mcp_SOURCES) $(ratecontrol_SOURCES) \
         $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(tngweather_SOURCES) \
-        $(triggerschedule_SOURCES) $(viewer_SOURCES)
+        $(scheduler_SOURCES) $(skypeclient_SOURCES) \
+        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(tngweather_SOURCES) $(triggerschedule_SOURCES) \
+        $(viewer_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -471 +478 @@
         $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \
         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-        sched.c $(scheduler_SOURCES) $(smartfact_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(tngweather_SOURCES) \
-        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
+        sched.c $(scheduler_SOURCES) $(skypeclient_SOURCES) \
+        $(smartfact_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(tngweather_SOURCES) $(triggerschedule_SOURCES) \
+        $(am__viewer_SOURCES_DIST)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -519 +527 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -705 +715 @@
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   $(SVN_REVISION)
-
+   $(SVN_REVISION) 
+
+#`pkg-config --cflags --libs dbus-1` `pkg-config --cflags --libs dbus-glib-1`
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
@@ -735 +746 @@
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_10) $(am__append_13)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_11) $(am__append_14)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -743 +754 @@
         dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
         $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
-        $(viewer_RESOURCES) $(am__append_9) $(am__append_12)
+        $(viewer_RESOURCES) $(am__append_10) $(am__append_13)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -895 +906 @@
         src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
         src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
-        $(am__append_6)
+        $(am__append_7)
 fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -940 +951 @@
         libDim++.la libDim.la libDimExtension.la libConfiguration.la
 
+skypeclient_SOURCES = src/skypeclient.cc src/ChatClient.h
+skypeclient_LDADD = libStateMachine.la libTools.la libTime.la \
+        libDim++.la libDim.la libDimExtension.la libConfiguration.la
+
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
@@ -948 +963 @@
 test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-        $(am__append_7)
+        $(am__append_8)
 datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1026 +1041 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_8) $(am__append_11)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_9) $(am__append_12)
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1471 +1486 @@
         @rm -f scheduler$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
+src/skypeclient.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+skypeclient$(EXEEXT): $(skypeclient_OBJECTS) $(skypeclient_DEPENDENCIES) 
+        @rm -f skypeclient$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(skypeclient_OBJECTS) $(skypeclient_LDADD) $(LIBS)
 src/smartfact.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1683 +1703 @@
         -rm -f src/readfits.$(OBJEXT)
         -rm -f src/scheduler.$(OBJEXT)
+        -rm -f src/skypeclient.$(OBJEXT)
         -rm -f src/smartfact.$(OBJEXT)
         -rm -f src/test.$(OBJEXT)
@@ -1809 +1830 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readfits.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/skypeclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/smartfact.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@