diff --git a/Makefile b/Makefile index 8a53260d..2b997b75 100644 --- a/Makefile +++ b/Makefile @@ -20,26 +20,26 @@ UNAME := $(shell uname) export UNAME all: - LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) - LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) + @LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) + @LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) install: - $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS) - $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS) clean: - $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS) - $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS) - $(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS) updateIndexDefines: - $(MAKE) -C $(top_srcdir)/cpp/build -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/build -$(MAKEFLAGS) $(MAKECMDGOALS) test: - $(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS) + @$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS) cpp/src/vers.cpp: - LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp + @LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp check: xmltest diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile index fe37cf55..e287678f 100644 --- a/cpp/examples/MinOZW/Makefile +++ b/cpp/examples/MinOZW/Makefile @@ -66,8 +66,8 @@ LDFLAGS+= -lusb-1.0 endif $(OBJDIR)/MinOZW: $(patsubst %.cpp,$(OBJDIR)/%.o,$(minozwsrc)) - @echo "Linking $(OBJDIR)/MinOZW" - $(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread + @echo "Linking MinOZW" + @$(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread $(top_builddir)/MinOZW: $(top_srcdir)/cpp/examples/MinOZW/MinOZW.in $(OBJDIR)/MinOZW @echo "Creating Temporary Shell Launch Script" diff --git a/cpp/src/Utils.h b/cpp/src/Utils.h index e20d8d5e..606e476d 100644 --- a/cpp/src/Utils.h +++ b/cpp/src/Utils.h @@ -37,11 +37,13 @@ #include #include #ifndef WIN32 +#ifndef WINRT #ifdef DEBUG #include #include #endif #endif +#endif namespace OpenZWave { @@ -153,7 +155,9 @@ namespace OpenZWave string intToString(int x); const char* rssi_to_string(uint8 _data); + #ifndef WIN32 +#ifndef WINRT #ifdef DEBUG class StackTraceGenerator { @@ -249,6 +253,7 @@ namespace OpenZWave } }; #endif +#endif #endif } // namespace Internal } // namespace OpenZWave diff --git a/dist/openzwave.spec b/dist/openzwave.spec index 772bc65f..3e64afad 100644 --- a/dist/openzwave.spec +++ b/dist/openzwave.spec @@ -3,7 +3,7 @@ %endif Name: openzwave -Version: 1.6.776 +Version: 1.6.777 Release: 1.0%{?dist} Summary: Sample Executables for OpenZWave URL: http://www.openzwave.net @@ -135,7 +135,7 @@ getent group zwave >/dev/null || groupadd -f -r zwave %changelog -* Wed May 08 2019 Justin Hammond - 1.6.776 +* Wed May 08 2019 Justin Hammond - 1.6.777 - Update to new release of OpenZwave - 1.6 * Fri Feb 01 2019 Fedora Release Engineering - 1.5.0-0.20180624git1e36dcc.0