diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:43:45 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:43:45 +0000 |
| commit | fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad (patch) | |
| tree | 798e7e0a8fc53429b26d536ecb6ec1a176923ded /other/Makefile | |
| parent | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (diff) | |
| download | netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.tar.gz netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.tar.xz netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.zip | |
Fix up commit mess
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2223 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'other/Makefile')
| -rw-r--r-- | other/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/other/Makefile b/other/Makefile index 69562be0..33c52a00 100644 --- a/other/Makefile +++ b/other/Makefile @@ -28,12 +28,12 @@ PORTBINARIES = pamarith pambayer pamchannel pamdepth \ pamstack pamsummcol pamvalidate pnmcolormap \ ppmdcfont ppmddumpfont ppmdmkfont -BINARIES = $(PORTBINARIES) - ifneq ($(LINUXSVGALIB),NONE) - BINARIES += ppmsvgalib + PORTBINARIES += ppmsvgalib endif +BINARIES = $(PORTBINARIES) + SCRIPTS = ppmtomap pamfixtrunc OBJECTS = $(BINARIES:%=%.o) @@ -50,10 +50,7 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/common.mk -ppmsvgalib: %: %.o $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $< \ - $(shell $(LIBOPT) $(NETPBMLIB) $(LINUXSVGALIB)) \ - $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(LADD) +ppmsvgalib: LDFLAGS_TARGET = $(LINUXSVGALIB) install.bin: install.bin.local .PHONY: install.bin.local |