Browse Source

Fix how library dependencies are built

Bradlee Speice 7 years ago
parent
commit
98dbd7ef83
3 changed files with 5 additions and 5 deletions
  1. 1
    1
      examples/Makefile.am
  2. 2
    2
      libcvautomation.pc.in
  3. 2
    2
      libcvautomation/Makefile.am

+ 1
- 1
examples/Makefile.am View File

@@ -1,6 +1,6 @@
1 1
 if BUILD_EXAMPLES
2 2
 #Need to include the -Ilibcvautomation so that libcvautomation.h can find everything that it needs
3
-AM_LDFLAGS = -L../libcvautomation/.libs -lcvautomation @X11_LIBS@ @XTEST_LIBS@ @CV_LIBS@
3
+AM_LDFLAGS = -L../libcvautomation/.libs -lcvautomation
4 4
 AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include @X11_CFLAGS@ @XTEST_CFLAGS@ @CV_CFLAGS@
5 5
 
6 6
 #Build only if we're building the examples

+ 2
- 2
libcvautomation.pc.in View File

@@ -6,5 +6,5 @@ includedir=@includedir@
6 6
 Name: Libcvautomation
7 7
 Description: GUI Automation and Testing tool based on OpenCV and XTest
8 8
 Version: @VERSION@
9
-Libs: -L${libdir} -lcvautomation @CV_LIBS@ @X11_LIBS@ @XTEST_LIBS@
10
-Cflags: -I${includedir} @CV_CFLAGS@ @X11_CFLAGS@ @XTEST_CFLAGS@
9
+Libs: -L${libdir} -lcvautomation
10
+Cflags: -I${includedir}

+ 2
- 2
libcvautomation/Makefile.am View File

@@ -1,5 +1,5 @@
1
-AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include/
2
-AM_LDFLAGS =
1
+AM_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include @X11_CFLAGS@ @XTEST_CFLAGS@ @CV_CFLAGS@
2
+AM_LDFLAGS = @X11_LIBS@ @XTEST_LIBS@ @CV_LIBS@
3 3
 AM_LIBS = -shared
4 4
 
5 5
 #Lists the libraries to build

Loading…
Cancel
Save