Makefile: allow out of tree builds

use top_srcdir rather than top_builddir for AM_CPPFLAGS
add EXTRA_DIST to man Makefile. fixes distcheck target.

Change-Id: I308dc1c98f096de1efe188f63d040ef953598e78
This commit is contained in:
James Zern 2011-03-15 15:25:49 -07:00
parent 4c0da7aad5
commit e532b9abb1
8 changed files with 9 additions and 7 deletions

View File

@ -1 +1,2 @@
man_MANS = cwebp.1 dwebp.1 man_MANS = cwebp.1 dwebp.1
EXTRA_DIST = $(man_MANS)

View File

@ -188,6 +188,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = cwebp.1 dwebp.1 man_MANS = cwebp.1 dwebp.1
EXTRA_DIST = $(man_MANS)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

View File

@ -1,6 +1,6 @@
SUBDIRS = dec enc SUBDIRS = dec enc
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
lib_LTLIBRARIES = libwebp.la lib_LTLIBRARIES = libwebp.la
libwebp_la_SOURCES = libwebp_la_SOURCES =

View File

@ -247,7 +247,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = dec enc SUBDIRS = dec enc
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
lib_LTLIBRARIES = libwebp.la lib_LTLIBRARIES = libwebp.la
libwebp_la_SOURCES = libwebp_la_SOURCES =
libwebp_la_LIBADD = dec/libwebpdecode.la \ libwebp_la_LIBADD = dec/libwebpdecode.la \

View File

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \ libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \
quant.c tree.c vp8.c webp.c yuv.c quant.c tree.c vp8.c webp.c yuv.c

View File

@ -211,7 +211,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \ libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \
quant.c tree.c vp8.c webp.c yuv.c quant.c tree.c vp8.c webp.c yuv.c
@ -263,7 +263,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libwebpdecode.la: $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_DEPENDENCIES) libwebpdecode.la: $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_DEPENDENCIES)
$(libwebpdecode_la_LINK) $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_LIBADD) $(LIBS) $(libwebpdecode_la_LINK) $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:

View File

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \ libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \
config.c cost.c cost.h dsp.c filter.c \ config.c cost.c cost.h dsp.c filter.c \

View File

@ -212,7 +212,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_builddir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \ libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \
config.c cost.c cost.h dsp.c filter.c \ config.c cost.c cost.h dsp.c filter.c \
frame.c iterator.c picture.c quant.c \ frame.c iterator.c picture.c quant.c \