Changeset 14947
- Timestamp:
- 02/23/13 10:56:20 (12 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/Makefile.am
r14871 r14947 75 75 76 76 if HAS_LIBXP 77 bin_PROGRAMS += did 77 bin_PROGRAMS += did webDid 78 78 endif 79 79 … … 152 152 dim/src/did/dui_util.c dim/src/did/dui_util.h \ 153 153 dim/src/did/dui_colors.h 154 155 webDid_LDADD = libDim.la 156 webDid_CPPFLAGS = $(AM_CPPFLAGS) -Idim/src/did 157 webDid_SOURCES = \ 158 dim/src/webDid/webDid.c \ 159 src/webServer.c \ 160 dim/src/webDid/webTcpip.c 154 161 155 162 -
trunk/FACT++/Makefile.in
r14871 r14947 65 65 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_6 = makedata 66 66 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_7 = makeplots 67 @HAS_LIBXP_TRUE@am__append_8 = did 67 @HAS_LIBXP_TRUE@am__append_8 = did webDid 68 68 69 69 # This is a trick to be able to build them but not having them in 'all' … … 190 190 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makedata$(EXEEXT) 191 191 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makeplots$(EXEEXT) 192 @HAS_LIBXP_TRUE@am__EXEEXT_8 = did$(EXEEXT) 192 @HAS_LIBXP_TRUE@am__EXEEXT_8 = did$(EXEEXT) webDid$(EXEEXT) 193 193 @IS_FALSE@am__EXEEXT_9 = test$(EXEEXT) scheduler$(EXEEXT) \ 194 194 @IS_FALSE@ triggerschedule$(EXEEXT) dclient5$(EXEEXT) \ … … 452 452 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(viewer_CXXFLAGS) \ 453 453 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 454 am_webDid_OBJECTS = dim/src/webDid/webDid-webDid.$(OBJEXT) \ 455 src/webDid-webServer.$(OBJEXT) \ 456 dim/src/webDid/webDid-webTcpip.$(OBJEXT) 457 webDid_OBJECTS = $(am_webDid_OBJECTS) 458 webDid_DEPENDENCIES = libDim.la 454 459 am_zfits_OBJECTS = src/zfits.$(OBJEXT) 455 460 zfits_OBJECTS = $(am_zfits_OBJECTS) … … 517 522 $(skypeclient_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \ 518 523 $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ 519 $(triggerschedule_SOURCES) $(viewer_SOURCES) $(zfits_SOURCES) 524 $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \ 525 $(zfits_SOURCES) 520 526 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ 521 527 $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \ … … 539 545 $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \ 540 546 $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \ 541 $( zfits_SOURCES)547 $(webDid_SOURCES) $(zfits_SOURCES) 542 548 man1dir = $(mandir)/man1 543 549 NROFF = nroff … … 845 851 dim/src/did/dui_colors.h 846 852 853 webDid_LDADD = libDim.la 854 webDid_CPPFLAGS = $(AM_CPPFLAGS) -Idim/src/did 855 webDid_SOURCES = \ 856 dim/src/webDid/webDid.c \ 857 src/webServer.c \ 858 dim/src/webDid/webTcpip.c 859 847 860 848 861 #libDim_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS) … … 1719 1732 @rm -f viewer$(EXEEXT) 1720 1733 $(AM_V_CXXLD)$(viewer_LINK) $(viewer_OBJECTS) $(viewer_LDADD) $(LIBS) 1734 dim/src/webDid/$(am__dirstamp): 1735 @$(MKDIR_P) dim/src/webDid 1736 @: > dim/src/webDid/$(am__dirstamp) 1737 dim/src/webDid/$(DEPDIR)/$(am__dirstamp): 1738 @$(MKDIR_P) dim/src/webDid/$(DEPDIR) 1739 @: > dim/src/webDid/$(DEPDIR)/$(am__dirstamp) 1740 dim/src/webDid/webDid-webDid.$(OBJEXT): \ 1741 dim/src/webDid/$(am__dirstamp) \ 1742 dim/src/webDid/$(DEPDIR)/$(am__dirstamp) 1743 src/webDid-webServer.$(OBJEXT): src/$(am__dirstamp) \ 1744 src/$(DEPDIR)/$(am__dirstamp) 1745 dim/src/webDid/webDid-webTcpip.$(OBJEXT): \ 1746 dim/src/webDid/$(am__dirstamp) \ 1747 dim/src/webDid/$(DEPDIR)/$(am__dirstamp) 1748 webDid$(EXEEXT): $(webDid_OBJECTS) $(webDid_DEPENDENCIES) $(EXTRA_webDid_DEPENDENCIES) 1749 @rm -f webDid$(EXEEXT) 1750 $(AM_V_CCLD)$(LINK) $(webDid_OBJECTS) $(webDid_LDADD) $(LIBS) 1721 1751 src/zfits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) 1722 1752 zfits$(EXEEXT): $(zfits_OBJECTS) $(zfits_DEPENDENCIES) $(EXTRA_zfits_DEPENDENCIES) … … 1764 1794 -rm -f dim/src/utilities.$(OBJEXT) 1765 1795 -rm -f dim/src/utilities.lo 1796 -rm -f dim/src/webDid/webDid-webDid.$(OBJEXT) 1797 -rm -f dim/src/webDid/webDid-webTcpip.$(OBJEXT) 1766 1798 -rm -f gui/BasicGlCamera.$(OBJEXT) 1767 1799 -rm -f gui/BasicGlCamera.moc.$(OBJEXT) … … 1907 1939 -rm -f src/viewer-FitsFile.$(OBJEXT) 1908 1940 -rm -f src/viewer-PixelMap.$(OBJEXT) 1941 -rm -f src/webDid-webServer.$(OBJEXT) 1909 1942 -rm -f src/zfits.$(OBJEXT) 1910 1943 … … 1935 1968 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-did.Po@am__quote@ 1936 1969 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@ 1970 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/webDid/$(DEPDIR)/webDid-webDid.Po@am__quote@ 1971 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Po@am__quote@ 1937 1972 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.Po@am__quote@ 1938 1973 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.moc.Po@am__quote@ … … 2048 2083 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-FitsFile.Po@am__quote@ 2049 2084 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/viewer-PixelMap.Po@am__quote@ 2085 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/webDid-webServer.Po@am__quote@ 2050 2086 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/zfits.Po@am__quote@ 2051 2087 … … 2101 2137 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2102 2138 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/did/did-dui_util.obj `if test -f 'dim/src/did/dui_util.c'; then $(CYGPATH_W) 'dim/src/did/dui_util.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/did/dui_util.c'; fi` 2139 2140 dim/src/webDid/webDid-webDid.o: dim/src/webDid/webDid.c 2141 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/webDid/webDid-webDid.o -MD -MP -MF dim/src/webDid/$(DEPDIR)/webDid-webDid.Tpo -c -o dim/src/webDid/webDid-webDid.o `test -f 'dim/src/webDid/webDid.c' || echo '$(srcdir)/'`dim/src/webDid/webDid.c 2142 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) dim/src/webDid/$(DEPDIR)/webDid-webDid.Tpo dim/src/webDid/$(DEPDIR)/webDid-webDid.Po 2143 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dim/src/webDid/webDid.c' object='dim/src/webDid/webDid-webDid.o' libtool=no @AMDEPBACKSLASH@ 2144 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2145 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/webDid/webDid-webDid.o `test -f 'dim/src/webDid/webDid.c' || echo '$(srcdir)/'`dim/src/webDid/webDid.c 2146 2147 dim/src/webDid/webDid-webDid.obj: dim/src/webDid/webDid.c 2148 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/webDid/webDid-webDid.obj -MD -MP -MF dim/src/webDid/$(DEPDIR)/webDid-webDid.Tpo -c -o dim/src/webDid/webDid-webDid.obj `if test -f 'dim/src/webDid/webDid.c'; then $(CYGPATH_W) 'dim/src/webDid/webDid.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/webDid/webDid.c'; fi` 2149 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) dim/src/webDid/$(DEPDIR)/webDid-webDid.Tpo dim/src/webDid/$(DEPDIR)/webDid-webDid.Po 2150 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dim/src/webDid/webDid.c' object='dim/src/webDid/webDid-webDid.obj' libtool=no @AMDEPBACKSLASH@ 2151 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2152 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/webDid/webDid-webDid.obj `if test -f 'dim/src/webDid/webDid.c'; then $(CYGPATH_W) 'dim/src/webDid/webDid.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/webDid/webDid.c'; fi` 2153 2154 src/webDid-webServer.o: src/webServer.c 2155 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/webDid-webServer.o -MD -MP -MF src/$(DEPDIR)/webDid-webServer.Tpo -c -o src/webDid-webServer.o `test -f 'src/webServer.c' || echo '$(srcdir)/'`src/webServer.c 2156 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/webDid-webServer.Tpo src/$(DEPDIR)/webDid-webServer.Po 2157 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/webServer.c' object='src/webDid-webServer.o' libtool=no @AMDEPBACKSLASH@ 2158 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2159 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/webDid-webServer.o `test -f 'src/webServer.c' || echo '$(srcdir)/'`src/webServer.c 2160 2161 src/webDid-webServer.obj: src/webServer.c 2162 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/webDid-webServer.obj -MD -MP -MF src/$(DEPDIR)/webDid-webServer.Tpo -c -o src/webDid-webServer.obj `if test -f 'src/webServer.c'; then $(CYGPATH_W) 'src/webServer.c'; else $(CYGPATH_W) '$(srcdir)/src/webServer.c'; fi` 2163 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/webDid-webServer.Tpo src/$(DEPDIR)/webDid-webServer.Po 2164 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/webServer.c' object='src/webDid-webServer.obj' libtool=no @AMDEPBACKSLASH@ 2165 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2166 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/webDid-webServer.obj `if test -f 'src/webServer.c'; then $(CYGPATH_W) 'src/webServer.c'; else $(CYGPATH_W) '$(srcdir)/src/webServer.c'; fi` 2167 2168 dim/src/webDid/webDid-webTcpip.o: dim/src/webDid/webTcpip.c 2169 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/webDid/webDid-webTcpip.o -MD -MP -MF dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Tpo -c -o dim/src/webDid/webDid-webTcpip.o `test -f 'dim/src/webDid/webTcpip.c' || echo '$(srcdir)/'`dim/src/webDid/webTcpip.c 2170 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Tpo dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Po 2171 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dim/src/webDid/webTcpip.c' object='dim/src/webDid/webDid-webTcpip.o' libtool=no @AMDEPBACKSLASH@ 2172 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2173 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/webDid/webDid-webTcpip.o `test -f 'dim/src/webDid/webTcpip.c' || echo '$(srcdir)/'`dim/src/webDid/webTcpip.c 2174 2175 dim/src/webDid/webDid-webTcpip.obj: dim/src/webDid/webTcpip.c 2176 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/webDid/webDid-webTcpip.obj -MD -MP -MF dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Tpo -c -o dim/src/webDid/webDid-webTcpip.obj `if test -f 'dim/src/webDid/webTcpip.c'; then $(CYGPATH_W) 'dim/src/webDid/webTcpip.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/webDid/webTcpip.c'; fi` 2177 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Tpo dim/src/webDid/$(DEPDIR)/webDid-webTcpip.Po 2178 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dim/src/webDid/webTcpip.c' object='dim/src/webDid/webDid-webTcpip.obj' libtool=no @AMDEPBACKSLASH@ 2179 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 2180 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(webDid_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/webDid/webDid-webTcpip.obj `if test -f 'dim/src/webDid/webTcpip.c'; then $(CYGPATH_W) 'dim/src/webDid/webTcpip.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/webDid/webTcpip.c'; fi` 2103 2181 2104 2182 .cc.o: … … 2667 2745 -rm -f dim/src/did/$(DEPDIR)/$(am__dirstamp) 2668 2746 -rm -f dim/src/did/$(am__dirstamp) 2747 -rm -f dim/src/webDid/$(DEPDIR)/$(am__dirstamp) 2748 -rm -f dim/src/webDid/$(am__dirstamp) 2669 2749 -rm -f gui/$(DEPDIR)/$(am__dirstamp) 2670 2750 -rm -f gui/$(am__dirstamp) … … 2685 2765 distclean: distclean-am 2686 2766 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 2687 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR)2767 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR) 2688 2768 -rm -f Makefile 2689 2769 distclean-am: clean-am distclean-compile distclean-generic \ … … 2734 2814 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 2735 2815 -rm -rf $(top_srcdir)/autom4te.cache 2736 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR)2816 -rm -rf ./$(DEPDIR) dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) dim/src/webDid/$(DEPDIR) gui/$(DEPDIR) gui/RawEventsViewer/$(DEPDIR) src/$(DEPDIR) 2737 2817 -rm -f Makefile 2738 2818 maintainer-clean-am: distclean-am maintainer-clean-generic
Note:
See TracChangeset
for help on using the changeset viewer.