mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-07-02 06:16:49 -04:00
Code Issues Releases Wiki Activity

Merge include/opencv1 and include/opencv2

Browse Source 
Warning, this is a brutish hack, and unless fixed, should not be used.
This commit is contained in:
Bradlee Speice
2012-07-19 17:17:06 -04:00
parent 556e8b59ed
commit c4c700fcda
17 changed files with 23 additions and 2551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcvautomation/Makefile.am
View File

@ -1,8 +1,4 @@
if USEOPENCV2
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv2
else
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/opencv1
endif
AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/
AM_LDFLAGS =
AM_LIBS = -shared
@ -12,8 +8,4 @@ libcvautomation_la_SOURCES = libcvautomation-opencv.c libcvautomation-xlib.c lib
#libcvautomation_CFLAGS = -shared -I$(top_srcdir)/include -I$(top_srcdir)/libcvautomation -I$(top_srcdir)/include/libcvautomation
#Lists the headers to distribute
if USEOPENCV2
pkginclude_HEADERS = $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/opencv2/libcvautomation/libcvautomation-xtest.h $(top_srcdir)/include/opencv2/libcvautomation/xautomation_kbd.h $(top_srcdir)/include/opencv2/libcvautomation/xautomation_keysym_map.h $(top_srcdir)/include/opencv2/libcvautomation/xautomation_multikey_map.h
else
pkginclude_HEADERS = $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/opencv1/libcvautomation/libcvautomation-xtest.h $(top_srcdir)/include/opencv1/libcvautomation/xautomation_kbd.h $(top_srcdir)/include/opencv1/libcvautomation/xautomation_keysym_map.h $(top_srcdir)/include/opencv1/libcvautomation/xautomation_multikey_map.h
endif
pkginclude_HEADERS = $(top_srcdir)/include/libcvautomation/libcvautomation.h $(top_srcdir)/include/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/libcvautomation/libcvautomation-xtest.h $(top_srcdir)/include/libcvautomation/xautomation_kbd.h $(top_srcdir)/include/libcvautomation/xautomation_keysym_map.h $(top_srcdir)/include/libcvautomation/xautomation_multikey_map.h