diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
| commit | 43939e66b1d4eeb2f3799c124f3598756755005a (patch) | |
| tree | 15733092de55d52421a6ea02f5a43d5f8ff24393 /converter/other/fiasco/codec | |
| parent | 49f4336c9bba33650573ba780b70bc501b38643e (diff) | |
| download | netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.gz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.xz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.zip | |
Rebase Stable series to current Advanced: 10.47.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@995 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/fiasco/codec')
| -rw-r--r-- | converter/other/fiasco/codec/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/converter/other/fiasco/codec/Makefile b/converter/other/fiasco/codec/Makefile index 9a9d502a..e3b2a112 100644 --- a/converter/other/fiasco/codec/Makefile +++ b/converter/other/fiasco/codec/Makefile @@ -6,9 +6,9 @@ FIASCOSUBDIR = converter/other/fiasco SUBDIR = $(FIASCOSUBDIR)/codec VPATH=.:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk -INCLUDES = -I$(SRCDIR)/$(FIASCOSUBDIR) -I$(SRCDIR)/$(FIASCOSUBDIR)/lib \ +COMP_INCLUDES = -I$(SRCDIR)/$(FIASCOSUBDIR) -I$(SRCDIR)/$(FIASCOSUBDIR)/lib \ -I$(SRCDIR)/$(FIASCOSUBDIR)/input -I$(SRCDIR)/$(FIASCOSUBDIR)/output OBJECTS = approx.o bintree.o coder.o coeff.o \ @@ -19,7 +19,7 @@ MERGE_OBJECTS = $(OBJECTS) all: libfiasco_codec.a -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk libfiasco_codec.a: $(OBJECTS) $(AR) -rc $@ $(OBJECTS) |