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 /analyzer/Makefile | |
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 'analyzer/Makefile')
-rw-r--r-- | analyzer/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/analyzer/Makefile b/analyzer/Makefile index 6a447ea7..9a9a5e10 100644 --- a/analyzer/Makefile +++ b/analyzer/Makefile @@ -5,7 +5,7 @@ endif SUBDIR = analyzer VPATH=.:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk # We tend to separate out the build targets so that we don't have # any more dependencies for a given target than it really needs. @@ -15,7 +15,7 @@ include $(BUILDDIR)/Makefile.config # build. PORTBINARIES = pamfile pamslice pamsumm pamtilt \ - pgmhist pnmhistmap ppmhist pgmminkowski + pbmminkowski pgmhist pnmhistmap ppmhist pgmminkowski MATHBINARIES = pamsharpmap pamsharpness pgmtexture pnmpsnr BINARIES = $(PORTBINARIES) $(MATHBINARIES) @@ -33,7 +33,7 @@ MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) .PHONY: all all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk install.bin: install.bin.local .PHONY: install.bin.local |