summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--include/Makefile.am1
-rw-r--r--include/X11/Makefile.am1
-rw-r--r--include/X11/extensions/Makefile.am2
-rw-r--r--src/Makefile.am6
6 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 92d9c35..5af25f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = src man
+SUBDIRS = src man include
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xv.pc
diff --git a/configure.ac b/configure.ac
index 0c9a0f7..309e6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,9 @@ AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
AC_OUTPUT([Makefile
+ include/Makefile
+ include/X11/Makefile
+ include/X11/extensions/Makefile
src/Makefile
man/Makefile
xv.pc])
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..a48f256
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = X11
diff --git a/include/X11/Makefile.am b/include/X11/Makefile.am
new file mode 100644
index 0000000..1b5c62d
--- /dev/null
+++ b/include/X11/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = extensions
diff --git a/include/X11/extensions/Makefile.am b/include/X11/extensions/Makefile.am
new file mode 100644
index 0000000..dca70b0
--- /dev/null
+++ b/include/X11/extensions/Makefile.am
@@ -0,0 +1,2 @@
+extdir = $(includedir)/X11/extensions
+ext_HEADERS = Xvlib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e54a72..9f8b3c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,6 @@ libXv_la_SOURCES = \
Xvlibint.h
libXv_la_LIBADD = @DEP_LIBS@
-AM_CFLAGS = @DEP_CFLAGS@
-
-libXv_la_LDFLAGS = -version-info 7:0:0 -no-undefined
-
+AM_CFLAGS = @DEP_CFLAGS@ -I$(top_srcdir)/include
+libXv_la_LDFLAGS = -version-info 1:0:0 -no-undefined