Branch: master

3fee07b4 2019-01-24 17:52:17 Timothy Pearson
Add Kerberos flags to Automake include lists
M clients/tde/src/Makefile.am
M clients/tde/src/app/Makefile.am
M clients/tde/src/part/adminconsole/Makefile.am
M clients/tde/src/part/adminusermgmt/Makefile.am
M clients/tde/src/part/commanalyzer/Makefile.am
M clients/tde/src/part/fpgaprogram/Makefile.am
M clients/tde/src/part/fpgaview/Makefile.am
M clients/tde/src/part/logicanalyzer/Makefile.am
M clients/tde/src/part/prototerminal/Makefile.am
M clients/tde/src/part/scope/Makefile.am
M clients/tde/src/part/scope/part.cpp
M clients/tde/src/part/sensormonitor/Makefile.am
M clients/tde/src/part/serialconsole/Makefile.am

clients/tde/src/Makefile.am

diff --git a/clients/tde/src/Makefile.am b/clients/tde/src/Makefile.am
index c44e4ca..659ba8c 100644
--- a/clients/tde/src/Makefile.am
+++ b/clients/tde/src/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS     = widgets dialogs app part
-INCLUDES    = $(all_includes)
+INCLUDES    = $(all_includes) $(KRB5_CFLAGS)
 METASOURCES = AUTO

clients/tde/src/app/Makefile.am

diff --git a/clients/tde/src/app/Makefile.am b/clients/tde/src/app/Makefile.am
index bf99c6e..01fa891 100644
--- a/clients/tde/src/app/Makefile.am
+++ b/clients/tde/src/app/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = views
-INCLUDES = $(all_includes) -I$(top_srcdir)/src  -I$(top_builddir)/src $(KDE_INCLUDES)/tde
+INCLUDES = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src  -I$(top_builddir)/src $(KDE_INCLUDES)/tde
 METASOURCES = AUTO
 
 KDE_ICON = remote_laboratory_client

clients/tde/src/part/adminconsole/Makefile.am

diff --git a/clients/tde/src/part/adminconsole/Makefile.am b/clients/tde/src/part/adminconsole/Makefile.am
index f4e419c..3d2ebfd 100644
--- a/clients/tde/src/part/adminconsole/Makefile.am
+++ b/clients/tde/src/part/adminconsole/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/adminusermgmt/Makefile.am

diff --git a/clients/tde/src/part/adminusermgmt/Makefile.am b/clients/tde/src/part/adminusermgmt/Makefile.am
index f3b21d0..fd9b013 100644
--- a/clients/tde/src/part/adminusermgmt/Makefile.am
+++ b/clients/tde/src/part/adminusermgmt/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/commanalyzer/Makefile.am

diff --git a/clients/tde/src/part/commanalyzer/Makefile.am b/clients/tde/src/part/commanalyzer/Makefile.am
index 87df16f..eacd326 100644
--- a/clients/tde/src/part/commanalyzer/Makefile.am
+++ b/clients/tde/src/part/commanalyzer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/fpgaprogram/Makefile.am

diff --git a/clients/tde/src/part/fpgaprogram/Makefile.am b/clients/tde/src/part/fpgaprogram/Makefile.am
index 600a039..d891582 100644
--- a/clients/tde/src/part/fpgaprogram/Makefile.am
+++ b/clients/tde/src/part/fpgaprogram/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/fpgaview/Makefile.am

diff --git a/clients/tde/src/part/fpgaview/Makefile.am b/clients/tde/src/part/fpgaview/Makefile.am
index f1efd6a..2b23465 100644
--- a/clients/tde/src/part/fpgaview/Makefile.am
+++ b/clients/tde/src/part/fpgaview/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/logicanalyzer/Makefile.am

diff --git a/clients/tde/src/part/logicanalyzer/Makefile.am b/clients/tde/src/part/logicanalyzer/Makefile.am
index cc29361..5489f9e 100644
--- a/clients/tde/src/part/logicanalyzer/Makefile.am
+++ b/clients/tde/src/part/logicanalyzer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/prototerminal/Makefile.am

diff --git a/clients/tde/src/part/prototerminal/Makefile.am b/clients/tde/src/part/prototerminal/Makefile.am
index dd7f18a..9e6af41 100644
--- a/clients/tde/src/part/prototerminal/Makefile.am
+++ b/clients/tde/src/part/prototerminal/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/scope/Makefile.am

diff --git a/clients/tde/src/part/scope/Makefile.am b/clients/tde/src/part/scope/Makefile.am
index 2ef5191..1abe8e4 100644
--- a/clients/tde/src/part/scope/Makefile.am
+++ b/clients/tde/src/part/scope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/scope/part.cpp

diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index 52cae83..a2d1ab3 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -2548,6 +2548,17 @@
 	processMathTraces();
 }
 
+// RAJA FIXME
+// This is NOT called properly when the base channel changes its secs/div
+// Instead I have to manually force a math trace update to make it reload the correct Hz/div in FFT mode
+
+// RAJA FIXME
+// After some unknown (random?) number of updates/reloads, the FFT gets "stuck" and won't update
+// Not sure if this is an FFTS problem or not
+// This ***might*** have been fixed when I repaired some of the memory initialization and allocation problems--not sure yet!
+
+// RAJA FIXME
+// Would be nice if there was a way to display phase information on the plot
 void ScopePart::updateMathTraceAllowedVoltsPerDivList(int traceno) {
 	if (m_mathFirstOperand[traceno] < 1) {
 		m_mathFirstOperand[traceno] = 1;

clients/tde/src/part/sensormonitor/Makefile.am

diff --git a/clients/tde/src/part/sensormonitor/Makefile.am b/clients/tde/src/part/sensormonitor/Makefile.am
index 0102bf5..62329e0 100644
--- a/clients/tde/src/part/sensormonitor/Makefile.am
+++ b/clients/tde/src/part/sensormonitor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO
 

clients/tde/src/part/serialconsole/Makefile.am

diff --git a/clients/tde/src/part/serialconsole/Makefile.am b/clients/tde/src/part/serialconsole/Makefile.am
index 0b941f5..e67b7b1 100644
--- a/clients/tde/src/part/serialconsole/Makefile.am
+++ b/clients/tde/src/part/serialconsole/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES     = $(all_includes) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
+INCLUDES     = $(all_includes) $(KRB5_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/widgets $(KDE_INCLUDES)/tde
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 METASOURCES  = AUTO