diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-11 17:15:13 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-11 17:15:13 +0000 |
| commit | 8e426b277e9b5e0378fda1e5fda2f5e41d476d84 (patch) | |
| tree | 32719a59f94dc99cf1dd33e62035400cb0aa3854 /converter/pbm/Makefile | |
| parent | 8daf5fbe5f185c35b053290edd86978fb32f8246 (diff) | |
| download | netpbm-mirror-8e426b277e9b5e0378fda1e5fda2f5e41d476d84.tar.gz netpbm-mirror-8e426b277e9b5e0378fda1e5fda2f5e41d476d84.tar.xz netpbm-mirror-8e426b277e9b5e0378fda1e5fda2f5e41d476d84.zip | |
Make G3 tables separate object files intead of inclusions; fix duplicate symbol in merge build
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3427 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/pbm/Makefile')
| -rw-r--r-- | converter/pbm/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile index 602cb156..b74bbb68 100644 --- a/converter/pbm/Makefile +++ b/converter/pbm/Makefile @@ -31,11 +31,12 @@ endif MATHBINARIES = pbmtopk BINARIES = $(PORTBINARIES) $(MATHBINARIES) SCRIPTS = pbmtox10bm +EXTRA_OBJECTS = g3ttable.o g3prefab.o -OBJECTS = $(BINARIES:%=%.o) +OBJECTS = $(BINARIES:%=%.o) $(EXTRA_OBJECTS) MERGEBINARIES = $(BINARIES) -MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) +MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) $(EXTRA_OBJECTS) SUBDIRS=pbmtoppa @@ -85,3 +86,9 @@ thisdirclean: localclean .PHONY: localclean localclean: -rm -f thinkjettopbm.c + +pbmtog3: g3ttable.o g3prefab.o +pbmtog3: ADDL_OBJECTS = g3ttable.o g3prefab.o + +g3topbm: g3ttable.o +g3topbm: ADDL_OBJECTS = g3ttable.o |