about summary refs log tree commit diff
path: root/converter/pbm
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-04-13 20:01:18 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-04-13 20:01:18 +0000
commitcb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59 (patch)
treea55bb883fb941ff7a483bcb76138d70b2149822b /converter/pbm
parent24d2e20391c5949c20bc419ab9e4974541011294 (diff)
downloadnetpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.gz
netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.xz
netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.zip
Add Windows icon capability, centralize make rule for link of programs
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2182 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/pbm')
-rw-r--r--converter/pbm/pbmtoppa/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile
index 5f205230..cf31ded6 100644
--- a/converter/pbm/pbmtoppa/Makefile
+++ b/converter/pbm/pbmtoppa/Makefile
@@ -9,17 +9,18 @@ include $(BUILDDIR)/config.mk
 
 all: pbmtoppa
 
-BINARIES = pbmtoppa
+PORTBINARIES = pbmtoppa
+
+BINARIES = $(PORTBINARIES)
 
 MERGEBINARIES = $(BINARIES)
 
-OBJECTS = pbmtoppa.o ppa.o pbm.o cutswath.o
-MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o
+ADDL_OBJECTS = ppa.o pbm.o cutswath.o
 
-include $(SRCDIR)/common.mk
+OBJECTS = pbmtoppa.o $(ADDL_OBJECTS)
 
-pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT)
-	$(LD) -o pbmtoppa $(OBJECTS) \
-	  -lm $(shell $(LIBOPT) $(NETPBMLIB)) $(LDFLAGS) $(LDLIBS) \
-	  $(RPATH) $(LADD)
+MERGE_OBJECTS = pbmtoppa.o2 $(ADDL_OBJECTS)
+
+include $(SRCDIR)/common.mk
 
+pbmtoppa: $(OBJECTS)