[packages/openzwave] - initial; based on FC
arekm
arekm at pld-linux.org
Sun Jan 21 19:11:47 CET 2018
commit 6b758c0784da005f38a5d73711b964ae48f4870f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Jan 21 19:11:29 2018 +0100
- initial; based on FC
openzwave-exceptions.patch | 19 ++++++
openzwave-hidapi.patch | 86 ++++++++++++++++++++++++++
openzwave-tinyxml.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++
openzwave.spec | 123 +++++++++++++++++++++++++++++++++++++
4 files changed, 376 insertions(+)
---
diff --git a/openzwave.spec b/openzwave.spec
new file mode 100644
index 0000000..6fbaa48
--- /dev/null
+++ b/openzwave.spec
@@ -0,0 +1,123 @@
+%define snap 20180121
+%define commit 793d1b8b093f382c46fb59fe6435da208802ce43
+
+Summary: Sample Executables for OpenZWave
+Name: openzwave
+Version: 1.5.0
+Release: 0.%{snap}.1
+License: LGPLv3+
+Group: Libraries
+URL: http://www.openzwave.net
+Source0: https://github.com/OpenZWave/open-zwave/archive/%{commit}.tar.gz
+# Source0-md5: fcd8fda2237693c8e93dacd954634818
+# Use system tinyxml
+Patch1: %{name}-tinyxml.patch
+# Use system hidapi
+Patch2: %{name}-hidapi.patch
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: hidapi-devel >= 0.8.0
+BuildRequires: systemd-devel
+BuildRequires: tinyxml-devel
+
+%description
+OpenZWave is an open-source, cross-platform library designed to enable
+anyone to add support for Z-Wave home-automation devices to their
+applications, without requiring any in depth knowledge of the Z-Wave
+protocol.
+
+%package -n libopenzwave
+Summary: Library to access Z-Wave interfaces
+
+%description -n libopenzwave
+OpenZWave is an open-source, cross-platform library designed to enable
+anyone to add support for Z-Wave home-automation devices to their
+applications, without requiring any in depth knowledge of the Z-Wave
+protocol.
+
+%package -n libopenzwave-devel
+Summary: Open-ZWave header files
+Requires: libopenzwave = %{version}-%{release}
+
+%description -n libopenzwave-devel
+Header files needed when you want to compile your own applications
+using openzwave
+
+%prep
+%setup -q -n open-zwave-%{commit}
+%patch1 -p1 -b.tinyxml
+%patch2 -p1 -b.hidapi
+
+%build
+major_ver=$(echo %{version} | awk -F \. {'print $1'})
+minor_ver=$(echo %{version} | awk -F \. {'print $2'})
+revision=$(echo %{version} | awk -F \. {'print $3'})
+
+CPPFLAGS="%{rpmcppflags} -Wformat -DOPENZWAVE_ENABLE_EXCEPTIONS" \
+ CFLAGS="%{rpmcflags}" \
+ LDFLAGS="%{rpmldflags} -pthread" \
+ VERSION_MAJ=$major_ver \
+ VERSION_MIN=$minor_ver \
+ VERSION_REV=$revision \
+ PREFIX=%{_prefix} \
+ sysconfdir=%{_sysconfdir}/openzwave/ \
+ includedir=%{_includedir} \
+ docdir=%{_defaultdocdir}/openzwave-%{version} \
+ instlibdir=%{_libdir} \
+ %{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+major_ver=$(echo %{version} | awk -F \. {'print $1'})
+minor_ver=$(echo %{version} | awk -F \. {'print $2'})
+revision=$(echo %{version} | awk -F \. {'print $3'})
+
+install -d $RPM_BUILD_ROOT/%{_bindir}
+install -d $RPM_BUILD_ROOT/%{_libdir}
+install -d $RPM_BUILD_ROOT/%{_docdir}/openzwave-%{version}/
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/
+install -d $RPM_BUILD_ROOT/%{_includedir}/openzwave/
+
+DESTDIR=$RPM_BUILD_ROOT \
+ VERSION_MAJ=$major_ver \
+ VERSION_MIN=$minor_ver \
+ VERSION_REV=$revision \
+ PREFIX=%{_prefix} \
+ sysconfdir=%{_sysconfdir}/openzwave/ \
+ includedir=%{_includedir}/openzwave/ \
+ docdir=%{_docdir}/openzwave-%{version} \
+ instlibdir=%{_libdir} \
+ %{__make} install
+
+rm $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/Doxyfile.in
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/html/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/default.htm
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/general/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/images+css/
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openzwave-%{version}/api/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -n libopenzwave -p /sbin/ldconfig
+%postun -n libopenzwave -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/MinOZW
+
+%files -n libopenzwave
+%defattr(644,root,root,755)
+%doc license/*.txt
+%doc docs/default.htm docs/general/ docs/images+css/
+%{_libdir}/libopenzwave.so.*
+%dir %{_sysconfdir}/openzwave/
+%config(noreplace) %{_sysconfdir}/openzwave/*
+
+%files -n libopenzwave-devel
+%defattr(644,root,root,755)
+%doc docs/api
+%attr(755,root,root) %{_bindir}/ozw_config
+%{_includedir}/openzwave/
+%{_libdir}/libopenzwave.so
+%{_pkgconfigdir}/libopenzwave.pc
diff --git a/openzwave-exceptions.patch b/openzwave-exceptions.patch
new file mode 100644
index 0000000..9ebb016
--- /dev/null
+++ b/openzwave-exceptions.patch
@@ -0,0 +1,19 @@
+--- a/cpp/src/Defs.h 2016-04-10 22:08:44.000000000 -0500
++++ b/cpp/src/Defs.h 2017-07-08 12:57:26.524725436 -0500
+@@ -146,14 +146,13 @@
+ }
+
+ #include "OZWException.h"
+-#define OPENZWAVE_DISABLE_EXCEPTIONS
+ #if defined(_MSC_VER)
+ # define __MYFUNCTION__ __FUNCTION__
+ #else
+ # define __MYFUNCTION__ __FILE__
+ #endif
+-// Exceptions : define OPENZWAVE_DISABLE_EXCEPTIONS in compiler flags to enable exceptions instead of exit function
+-#ifndef OPENZWAVE_DISABLE_EXCEPTIONS
++// Exceptions : define OPENZWAVE_ENABLE_EXCEPTIONS in compiler flags to enable exceptions instead of exit function
++#ifdef OPENZWAVE_ENABLE_EXCEPTIONS
+
+ # define OZW_FATAL_ERROR(exitCode, msg) Log::Write( LogLevel_Error,"Exception: %s:%d - %d - %s", std::string(__MYFUNCTION__).substr(std::string(__MYFUNCTION__).find_last_of("/\\") + 1).c_str(), __LINE__, exitCode, msg); \
+ throw OZWException(__MYFUNCTION__, __LINE__, exitCode, msg)
diff --git a/openzwave-hidapi.patch b/openzwave-hidapi.patch
new file mode 100644
index 0000000..af516d2
--- /dev/null
+++ b/openzwave-hidapi.patch
@@ -0,0 +1,86 @@
+--- a/cpp/build/Makefile 2017-07-22 18:47:08.989986000 -0500
++++ b/cpp/build/Makefile 2017-07-22 18:50:08.630119378 -0500
+@@ -66,31 +66,15 @@
+ #where to put the temporary library
+ LIBDIR ?= $(top_builddir)
+
+-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
+-
+-ifeq ($(UNAME),Darwin)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
+-else ifeq ($(UNAME),FreeBSD)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
+-else
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
+-endif
++INCLUDES := -I $(top_srcdir)/cpp/src -I /usr/include/hidapi/
+
+
+ SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes \
+- $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
++ $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(top_srcdir)/cpp/src/aes/
+ VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:\
+- $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
++ $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(top_srcdir)/cpp/src/aes/
+
+
+-ifeq ($(UNAME),Darwin)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
+-else ifeq ($(UNAME),FreeBSD)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
+-else
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/linux/*.c)) # we do not want the libusb version
+-endif
+-
+ ifeq ($(BITBAKE_ENV),1)
+ ar_option := "rc"
+ endif
+@@ -112,7 +96,6 @@
+ @echo "Building OpenZWave Version $(GITVERSION)"
+
+
+--include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(pform))
+@@ -131,8 +114,7 @@
+
+ #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp
+
+-$(LIBDIR)/libopenzwave.a: $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+- $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
++$(LIBDIR)/libopenzwave.a: $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \
+@@ -142,15 +124,14 @@
+ @$(AR) $(ar_option) $@ $+
+ @$(RANLIB) $@
+
+-$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+- $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
++$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(indep)) \
+ $(OBJDIR)/vers.o
+ @echo "Linking Shared Library"
+- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -ltinyxml
++ @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -lhidapi-libusb -ltinyxml
+ @ln -sf $(SHARED_LIB_NAME) $(LIBDIR)/$(SHARED_LIB_UNVERSIONED)
+
+ $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in $(PKGCONFIG)
+--- a/cpp/examples/MinOZW/Makefile 2017-07-22 18:47:08.989986000 -0500
++++ b/cpp/examples/MinOZW/Makefile 2017-07-22 18:51:44.854269158 -0500
+@@ -20,8 +20,8 @@
+ #where is put the temporary library
+ LIBDIR ?= $(top_builddir)
+
+-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
+-LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) -ltinyxml
++INCLUDES := -I $(top_srcdir)/cpp/src -I /usr/include/hidapi/
++LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) -lhidapi-libusb -ltinyxml
+ LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
+ minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
+ VPATH := $(top_srcdir)/cpp/examples/MinOZW
diff --git a/openzwave-tinyxml.patch b/openzwave-tinyxml.patch
new file mode 100644
index 0000000..4a62285
--- /dev/null
+++ b/openzwave-tinyxml.patch
@@ -0,0 +1,148 @@
+diff --git a/cpp/build/Makefile b/cpp/build/Makefile
+index d8bda225..90e15143 100644
+--- a/cpp/build/Makefile
++++ b/cpp/build/Makefile
+@@ -35,7 +35,7 @@ SHARED_LIB_NAME=libopenzwave.so.$(VERSION)
+ SHARED_LIB_UNVERSIONED=libopenzwave.so
+ endif
+
+-#if we are on a Mac, add these flags and libs to the compile and link phases
++#if we are on a Mac, add these flags and libs to the compile and link phases
+ ifeq ($(UNAME),Darwin)
+ CFLAGS += -c -DDARWIN
+ TARCH += -arch i386 -arch x86_64
+@@ -69,7 +69,7 @@ CFLAGS += $(CPPFLAGS)
+ #where to put the temporary library
+ LIBDIR ?= $(top_builddir)
+
+-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
++INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
+
+ ifeq ($(UNAME),Darwin)
+ SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
+@@ -80,13 +80,11 @@ SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
+ endif
+
+
+-SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
++SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes \
+ $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
+-VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\
++VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:\
+ $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
+-
+
+-tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
+
+ ifeq ($(UNAME),Darwin)
+ hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
+@@ -114,10 +112,9 @@ clean:
+ @rm -rf $(DEPDIR) $(OBJDIR) $(LIBDIR)/libopenzwave.so* $(LIBDIR)/libopenzwave*.dylib $(LIBDIR)/libopenzwave.a $(top_builddir)/libopenzwave.pc $(top_builddir)/docs/api $(top_builddir)/Doxyfile $(top_srcdir)/cpp/src/vers.cpp
+
+ printversion:
+- @echo "Building OpenZWave Version $(GITVERSION)"
++ @echo "Building OpenZWave Version $(GITVERSION)"
+
+
+--include $(patsubst %.cpp,$(DEPDIR)/%.d,$(tinyxml))
+ -include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
+@@ -133,12 +130,11 @@ $(top_srcdir)/cpp/src/vers.cpp:
+ @echo 'uint16_t ozw_vers_minor = $(VERSION_MIN);' >> $(top_srcdir)/cpp/src/vers.cpp
+ @echo 'uint16_t ozw_vers_revision = $(VERSION_REV);' >> $(top_srcdir)/cpp/src/vers.cpp
+ @echo 'char ozw_version_string[] = "$(GITVERSION)";' >> $(top_srcdir)/cpp/src/vers.cpp
+-
++
+
+ #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp
+
+-$(LIBDIR)/libopenzwave.a: $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+- $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
++$(LIBDIR)/libopenzwave.a: $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+ $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+@@ -149,8 +145,7 @@ $(LIBDIR)/libopenzwave.a: $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+ @$(AR) $(ar_option) $@ $+
+ @$(RANLIB) $@
+
+-$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+- $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
++$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+ $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+@@ -158,7 +153,7 @@ $(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+ $(patsubst %.cpp,$(OBJDIR)/%.o,$(indep)) \
+ $(OBJDIR)/vers.o
+ @echo "Linking Shared Library"
+- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS)
++ @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -ltinyxml
+ @ln -sf $(SHARED_LIB_NAME) $(LIBDIR)/$(SHARED_LIB_UNVERSIONED)
+
+ $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in $(PKGCONFIG)
+@@ -179,11 +174,11 @@ $(top_builddir)/ozw_config: $(top_srcdir)/cpp/build/ozw_config.in
+ -e 's|[@]pkgconfigfile@|$(pkgconfigdir)/libopenzwave.pc|g' \
+ < "$<" > "$@"
+ @chmod +x $(top_builddir)/ozw_config
+-
++
+ ifeq ($(DOT),)
+-HAVE_DOT = -e 's|[@]HAVE_DOT@|NO|g'
++HAVE_DOT = -e 's|[@]HAVE_DOT@|NO|g'
+ else
+-HAVE_DOT = -e 's|[@]HAVE_DOT@|YES|g'
++HAVE_DOT = -e 's|[@]HAVE_DOT@|YES|g'
+ endif
+
+ $(top_builddir)/Doxyfile: $(top_srcdir)/docs/Doxyfile.in $(top_srcdir)/cpp/src/vers.cpp
+@@ -218,7 +213,7 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc $(top_builddir)/libopenzwave.pc $(top_
+ @install -d $(DESTDIR)/$(includedir)/value_classes/
+ @install -m 0644 $(top_srcdir)/cpp/src/value_classes/*.h $(DESTDIR)/$(includedir)/value_classes/
+ @install -d $(DESTDIR)/$(includedir)/platform/
+- @install -m 0644 $(top_srcdir)/cpp/src/platform/*.h $(DESTDIR)/$(includedir)/platform/
++ @install -m 0644 $(top_srcdir)/cpp/src/platform/*.h $(DESTDIR)/$(includedir)/platform/
+ @install -d $(DESTDIR)/$(includedir)/platform/unix/
+ @install -m 0644 $(top_srcdir)/cpp/src/platform/unix/*.h $(DESTDIR)/$(includedir)/platform/unix/
+ @install -d $(DESTDIR)/$(includedir)/aes/
+@@ -231,13 +226,13 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc $(top_builddir)/libopenzwave.pc $(top_
+ @cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir)
+ @if [ -d "$(top_builddir)/docs/html/" ]; then cp -r $(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi
+ @echo "Installing Pkg-config Files"
+- @install -d $(DESTDIR)/$(pkgconfigdir)
++ @install -d $(DESTDIR)/$(pkgconfigdir)
+ @cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(pkgconfigdir)
+ @install -d $(DESTDIR)/$(PREFIX)/bin/
+ @cp $(top_builddir)/ozw_config $(DESTDIR)/$(PREFIX)/bin/ozw_config
+ @chmod 755 $(DESTDIR)/$(PREFIX)/bin/ozw_config
+
+-
++
+
+ .SUFFIXES: .d .cpp .o .a
+ .PHONY: default clean install doc
+diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile
+index 95d684b7..cbcbe991 100644
+--- a/cpp/examples/MinOZW/Makefile
++++ b/cpp/examples/MinOZW/Makefile
+@@ -20,8 +20,8 @@ top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
+ #where is put the temporary library
+ LIBDIR ?= $(top_builddir)
+
+-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
+-LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
++INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
++LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) -ltinyxml
+ LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
+ minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
+ VPATH := $(top_srcdir)/cpp/examples/MinOZW
+@@ -34,7 +34,7 @@ include $(top_srcdir)/cpp/build/support.mk
+
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(minozwsrc))
+
+-#if we are on a Mac, add these flags and libs to the compile and link phases
++#if we are on a Mac, add these flags and libs to the compile and link phases
+ ifeq ($(UNAME),Darwin)
+ CFLAGS += -DDARWIN
+ TARCH += -arch i386 -arch x86_64
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openzwave.git/commitdiff/6b758c0784da005f38a5d73711b964ae48f4870f
More information about the pld-cvs-commit
mailing list