diff options
author | DRC <dcommander@users.sourceforge.net> | 2010-02-13 22:55:05 +0000 |
---|---|---|
committer | DRC <dcommander@users.sourceforge.net> | 2010-02-13 22:55:05 +0000 |
commit | 971d851844d37c5fa01f76687a5cf0333c4e3136 (patch) | |
tree | c40bf85129b1d5004da11a8f283a41dbf28f0420 | |
parent | bd17e2a5d6929b5c1e6ddc33cc9a553d85f16817 (diff) | |
download | libjpeg-turbo-971d851844d37c5fa01f76687a5cf0333c4e3136.tar.gz |
Enable (i.e. fix) VPATH and out-of-tree builds
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@87 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r-- | Makefile.am | 28 | ||||
-rw-r--r-- | simd/Makefile.am | 8 |
2 files changed, 19 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index ffa4d178..9c435ad8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,16 +35,16 @@ noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c -jpgtest_LDADD = $(top_srcdir)/libturbojpeg.la +jpgtest_LDADD = libturbojpeg.la jpegut_SOURCES = $(TSTHDRS) jpegut.c bmp.h bmp.c -jpegut_LDADD = $(top_srcdir)/libturbojpeg.la +jpegut_LDADD = libturbojpeg.la cjpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c cjpeg.c rdbmp.c rdgif.c \ rdppm.c rdswitch.c rdtarga.c -cjpeg_LDADD = $(top_srcdir)/libjpeg.la +cjpeg_LDADD = libjpeg.la cjpeg_CFLAGS = -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED \ -DTARGA_SUPPORTED @@ -52,31 +52,31 @@ cjpeg_CFLAGS = -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED \ djpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c djpeg.c rdcolmap.c rdswitch.c \ wrbmp.c wrgif.c wrppm.c wrtarga.c -djpeg_LDADD = $(top_srcdir)/libjpeg.la +djpeg_LDADD = libjpeg.la djpeg_CFLAGS = -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED \ -DTARGA_SUPPORTED jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c -jpegtran_LDADD = $(top_srcdir)/libjpeg.la +jpegtran_LDADD = libjpeg.la rdjpgcom_SOURCES = wrjpgcom.c -rdjpgcom_LDADD = $(top_srcdir)/libjpeg.la +rdjpgcom_LDADD = libjpeg.la wrjpgcom_SOURCES = wrjpgcom.c -wrjpgcom_LDADD = $(top_srcdir)/libjpeg.la +wrjpgcom_LDADD = libjpeg.la test: testclean cjpeg djpeg jpegtran - $(top_srcdir)/jpegut - $(top_srcdir)/djpeg -dct int -ppm -outfile testout.ppm $(top_srcdir)/testorig.jpg - $(top_srcdir)/djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(top_srcdir)/testorig.jpg - $(top_srcdir)/cjpeg -dct int -outfile testout.jpg $(top_srcdir)/testimg.ppm - $(top_srcdir)/djpeg -dct int -ppm -outfile testoutp.ppm $(top_srcdir)/testprog.jpg - $(top_srcdir)/cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(top_srcdir)/testimg.ppm - $(top_srcdir)/jpegtran -outfile testoutt.jpg $(top_srcdir)/testprog.jpg + ./jpegut + ./djpeg -dct int -ppm -outfile testout.ppm $(srcdir)/testorig.jpg + ./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(srcdir)/testorig.jpg + ./cjpeg -dct int -outfile testout.jpg $(srcdir)/testimg.ppm + ./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg + ./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm + ./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg cmp $(top_srcdir)/testimg.ppm testout.ppm cmp $(top_srcdir)/testimg.bmp testout.bmp cmp $(top_srcdir)/testimg.jpg testout.jpg diff --git a/simd/Makefile.am b/simd/Makefile.am index 1df61431..36f24781 100644 --- a/simd/Makefile.am +++ b/simd/Makefile.am @@ -49,9 +49,11 @@ jdmermmx.lo: jdmrgmmx.asm jdmerss2.lo: jdmrgss2.asm endif +AM_CPPFLAGS = -I$(top_srcdir) + .asm.lo: - $(LIBTOOL) --mode=compile --tag NASM ./nasm_lt.sh $(NASM) $(NAFLAGS) $< -o $@ + $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) $< -o $@ -jsimdcfg.inc: jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h - $(CPP) jsimdcfg.inc.h | $(EGREP) ^[\;%] | sed 's%_cpp_protection_%%' > $@ +jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h + $(CPP) -I$(builddir) -I$(top_builddir) $(srcdir)/jsimdcfg.inc.h | $(EGREP) ^[\;%] | sed 's%_cpp_protection_%%' > $@ |