diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-02-14 02:11:04 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-02-14 02:11:04 +0000 |
| commit | 09e2ff130e9cd027aa46f38fb110cb2f10da0d11 (patch) | |
| tree | d179b7fb4d49bc5162762e1925063019b0afe9ca /common/jpeg | |
| parent | e338bf8f35a37baf9d077734141c7729534378ea (diff) | |
| download | tigervnc-09e2ff130e9cd027aa46f38fb110cb2f10da0d11.tar.gz tigervnc-09e2ff130e9cd027aa46f38fb110cb2f10da0d11.zip | |
Fix VPATH and out-of-tree builds
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3984 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/jpeg')
| -rw-r--r-- | common/jpeg/Makefile.am | 8 | ||||
| -rw-r--r-- | common/jpeg/simd/Makefile.am | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am index 26fe44c5..622b3627 100644 --- a/common/jpeg/Makefile.am +++ b/common/jpeg/Makefile.am @@ -30,16 +30,16 @@ noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c turbojpegl.c -jpgtest_LDADD = $(top_srcdir)/libjpeg.la +jpgtest_LDADD = libjpeg.la jpegut_SOURCES = $(TSTHDRS) jpegut.c bmp.h bmp.c turbojpegl.c -jpegut_LDADD = $(top_srcdir)/libjpeg.la +jpegut_LDADD = libjpeg.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 @@ -47,7 +47,7 @@ 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 diff --git a/common/jpeg/simd/Makefile.am b/common/jpeg/simd/Makefile.am index 1df61431..e57c4772 100644 --- a/common/jpeg/simd/Makefile.am +++ b/common/jpeg/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$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) ^[\;%] | sed 's%_cpp_protection_%%' > $@ |