diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-10-05 20:25:13 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-10-05 20:25:13 +0000 |
commit | 1a9796509502ded8f967f8f1e46716c4c4f906b4 (patch) | |
tree | 0e2361c2a6a9e8384180718e2009ebae6f00c240 /converter | |
parent | 2a23d8f80f14c97d9bbe8ce6f728bc8f909a986a (diff) | |
download | netpbm-mirror-1a9796509502ded8f967f8f1e46716c4c4f906b4.tar.gz netpbm-mirror-1a9796509502ded8f967f8f1e46716c4c4f906b4.tar.xz netpbm-mirror-1a9796509502ded8f967f8f1e46716c4c4f906b4.zip |
Rename Makefile.common to common.mk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@741 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
23 files changed, 23 insertions, 24 deletions
diff --git a/converter/Makefile b/converter/Makefile index 02cab3be..bc009b7e 100644 --- a/converter/Makefile +++ b/converter/Makefile @@ -14,4 +14,4 @@ all: $(SUBDIRS:%=%/all) SCRIPTS = BINARIES = -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk diff --git a/converter/other/Makefile b/converter/other/Makefile index 592eaac2..6e443770 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -134,7 +134,7 @@ SCRIPTS = anytopnm pnmtoplainpnm .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ifeq ($(NEED_RUNTIME_PATH),Y) LIBOPTR = -runtime diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile index 178b4fff..089f834b 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -28,7 +28,7 @@ BINARIES = cameratopam MERGEBINARIES = SCRIPTS = -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk cameratopam: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) $(LD) -o $@ $(LDFLAGS) \ diff --git a/converter/other/fiasco/Makefile b/converter/other/fiasco/Makefile index 0330802c..8a0100c6 100644 --- a/converter/other/fiasco/Makefile +++ b/converter/other/fiasco/Makefile @@ -32,7 +32,7 @@ MERGE_OBJECTS = $(BINARIES:%=%.o2) $(COMMON_OBJECTS) $(FIASCOLIBS) SUBDIRS = codec input output lib -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk $(BINARIES):%:%.o $(COMMON_OBJECTS) $(FIASCOLIBS) $(NETPBMLIB) \ $(LIBOPT) diff --git a/converter/other/fiasco/codec/Makefile b/converter/other/fiasco/codec/Makefile index c5f94c28..b126c677 100644 --- a/converter/other/fiasco/codec/Makefile +++ b/converter/other/fiasco/codec/Makefile @@ -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) diff --git a/converter/other/fiasco/input/Makefile b/converter/other/fiasco/input/Makefile index 6cd8e34b..714a8456 100644 --- a/converter/other/fiasco/input/Makefile +++ b/converter/other/fiasco/input/Makefile @@ -18,7 +18,7 @@ COMP_INCLUDES = -I$(SRCDIR)/$(FIASCOSUBDIR) -I$(SRCDIR)/$(FIASCOSUBDIR)/lib \ all: libfiasco_input.a -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk libfiasco_input.a: $(OBJECTS) $(AR) -rc $@ $(OBJECTS) diff --git a/converter/other/fiasco/lib/Makefile b/converter/other/fiasco/lib/Makefile index bd129016..7e19dc88 100644 --- a/converter/other/fiasco/lib/Makefile +++ b/converter/other/fiasco/lib/Makefile @@ -25,7 +25,7 @@ COMP_INCLUDES = -I$(SRCDIR)/$(FIASCOSUBDIR) all: libfiasco_lib.a -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk libfiasco_lib.a: $(OBJECTS) $(AR) -rc $@ $(OBJECTS) diff --git a/converter/other/fiasco/output/Makefile b/converter/other/fiasco/output/Makefile index fc1d4155..6f642a26 100644 --- a/converter/other/fiasco/output/Makefile +++ b/converter/other/fiasco/output/Makefile @@ -19,7 +19,7 @@ COMP_INCLUDES = \ all: libfiasco_output.a -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk libfiasco_output.a: $(OBJECTS) $(AR) -rc $@ $(OBJECTS) diff --git a/converter/other/jbig/Makefile b/converter/other/jbig/Makefile index 4be21582..ca99f6e8 100644 --- a/converter/other/jbig/Makefile +++ b/converter/other/jbig/Makefile @@ -33,7 +33,7 @@ MERGE_OBJECTS = $(BINARIES:%=%.o2) $(LIBJBIG_OBJECTS) all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk $(BINARIES): %: %.o $(JBIGLIB_DEP) $(NETPBMLIB) $(LIBOPT) $(LD) $(LDFLAGS) -o $@ $< \ diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 92225818..dac6c20d 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -55,7 +55,7 @@ MERGEBINARIES = $(BINARIES) .PHONY: all all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)) diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile index ad4fbd8f..99e12bcc 100644 --- a/converter/other/jpeg2000/libjasper/Makefile +++ b/converter/other/jpeg2000/libjasper/Makefile @@ -17,7 +17,7 @@ JASPERSRCDIR = $(SRCDIR)/$(SUBDIR) all: libjasper.a -include $(SRCDIR)/$(SUBDIR)/Makefile.common +include $(SRCDIR)/$(SUBDIR)/common.mk # We cheat a bit here -- the real dependencies are all the .o files listed # in the part list, but since we don't know what those are, we just do a diff --git a/converter/other/jpeg2000/libjasper/base/Makefile b/converter/other/jpeg2000/libjasper/base/Makefile index 0ee65b5e..bb4ea37b 100644 --- a/converter/other/jpeg2000/libjasper/base/Makefile +++ b/converter/other/jpeg2000/libjasper/base/Makefile @@ -17,5 +17,5 @@ MERGE_OBJECTS = all: partlist $(LIB_OBJECTS) -include $(JASPERSRCDIR)/Makefile.common +include $(JASPERSRCDIR)/common.mk diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/common.mk index d2cb7d42..1911adba 100644 --- a/converter/other/jpeg2000/libjasper/Makefile.common +++ b/converter/other/jpeg2000/libjasper/common.mk @@ -1,4 +1,3 @@ -# -*-makefile-*- <-- an Emacs control # This is common rules for the libjasper subdirectories. # # Set the following variables before including this: @@ -19,7 +18,7 @@ $(SUBDIRS:%=%/partlist): %/partlist: $(CURDIR)/% $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk INCLUDES = -I$(JASPERSRCDIR)/include -Iimportinc diff --git a/converter/other/jpeg2000/libjasper/jp2/Makefile b/converter/other/jpeg2000/libjasper/jp2/Makefile index 254b7f56..08bedd80 100644 --- a/converter/other/jpeg2000/libjasper/jp2/Makefile +++ b/converter/other/jpeg2000/libjasper/jp2/Makefile @@ -15,5 +15,5 @@ MERGE_OBJECTS = all: partlist $(LIB_OBJECTS) -include $(JASPERSRCDIR)/Makefile.common +include $(JASPERSRCDIR)/common.mk diff --git a/converter/other/jpeg2000/libjasper/jpc/Makefile b/converter/other/jpeg2000/libjasper/jpc/Makefile index e176bd48..84fb71b0 100644 --- a/converter/other/jpeg2000/libjasper/jpc/Makefile +++ b/converter/other/jpeg2000/libjasper/jpc/Makefile @@ -18,5 +18,5 @@ MERGE_OBJECTS = all: partlist $(LIB_OBJECTS) -include $(JASPERSRCDIR)/Makefile.common +include $(JASPERSRCDIR)/common.mk diff --git a/converter/other/pamtosvg/Makefile b/converter/other/pamtosvg/Makefile index 7f9c3e30..ff698882 100644 --- a/converter/other/pamtosvg/Makefile +++ b/converter/other/pamtosvg/Makefile @@ -47,7 +47,7 @@ MERGEBINARIES = $(BINARIES) all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk pamtosvg: $(PAMTOSVG_OBJECTS) $(NETPBMLIB) $(LIBOPT) $(LD) $(LDFLAGS) -o $@ $(PAMTOSVG_OBJECTS) \ diff --git a/converter/other/pnmtopalm/Makefile b/converter/other/pnmtopalm/Makefile index 3d802ed6..893b45e8 100644 --- a/converter/other/pnmtopalm/Makefile +++ b/converter/other/pnmtopalm/Makefile @@ -16,7 +16,7 @@ DATAFILES = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB)) diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile index f1533ab2..3da992d1 100644 --- a/converter/pbm/Makefile +++ b/converter/pbm/Makefile @@ -41,7 +41,7 @@ SUBDIRS=pbmtoppa .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ifneq ($(LEX)x,x) thinkjettopbm.c1:%.c1:%.l diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index c4be08b7..2b9be5d2 100644 --- a/converter/pbm/pbmtoppa/Makefile +++ b/converter/pbm/pbmtoppa/Makefile @@ -16,7 +16,7 @@ MERGEBINARIES = $(BINARIES) OBJECTS = pbmtoppa.o ppa.o pbm.o cutswath.o MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) $(LD) $(LDFLAGS) -o pbmtoppa $(OBJECTS) \ diff --git a/converter/pgm/Makefile b/converter/pgm/Makefile index f562fe92..7b39bcfd 100644 --- a/converter/pgm/Makefile +++ b/converter/pgm/Makefile @@ -20,4 +20,4 @@ MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) .PHONY: all all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk diff --git a/converter/ppm/Makefile b/converter/ppm/Makefile index 31ca826b..8c70fcac 100644 --- a/converter/ppm/Makefile +++ b/converter/ppm/Makefile @@ -42,7 +42,7 @@ MERGE_OBJECTS = $(BINARIES:%=%.o2) .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ppmtobmp.o ppmtobmp.o2: bmp.h diff --git a/converter/ppm/hpcdtoppm/Makefile b/converter/ppm/hpcdtoppm/Makefile index 9a7c67d0..00ebb116 100644 --- a/converter/ppm/hpcdtoppm/Makefile +++ b/converter/ppm/hpcdtoppm/Makefile @@ -12,7 +12,7 @@ all: hpcdtoppm SCRIPTS = hpcdtoppm pcdovtoppm MERGE_OBJECTS = -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk install: install.bin.local .PHONY: install.bin.local diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index 7e8f0b95..22b93272 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -76,7 +76,7 @@ SCRIPTS = .PHONY: all all: ppmtompeg -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ifeq ($(NEED_RUNTIME_PATH),Y) LIBOPTR = -runtime |