From cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sun, 13 Apr 2014 20:01:18 +0000
Subject: 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
---
 other/Makefile      | 11 ++++-------
 other/pamx/Makefile | 24 ++++++++++--------------
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'other')

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
diff --git a/other/pamx/Makefile b/other/pamx/Makefile
index b41cadf8..4e06e0fd 100644
--- a/other/pamx/Makefile
+++ b/other/pamx/Makefile
@@ -25,23 +25,20 @@ else
 endif
 
 ifeq ($(HAVE_X11LIB),Y)
-  BINARIES += pamx
+  PORTBINARIES += pamx
 
-  PAMX_OBJECTS = \
-	  pamx.o \
-	  image.o \
-	  send.o \
-	  window.o \
-
-  MERGE_OBJECTS = \
-	  pamx.o2 \
+  EXTRA_OBJECTS = \
 	  image.o \
 	  send.o \
 	  window.o \
 
 endif
 
-OBJECTS = $(PAMX_OBJECTS)
+BINARIES = $(PORTBINARIES)
+
+OBJECTS = $(BINARIES:%=%.o) $(EXTRA_OBJECTS)
+
+MERGE_OBJECTS = $(BINARIES:%=%.o2) $(EXTRA_OBJECTS)
 
 MERGEBINARIES = $(BINARIES)
 
@@ -55,7 +52,6 @@ else
   X11_LIBOPTS = $(shell pkg-config x11 --libs)
 endif
 
-pamx: $(PAMX_OBJECTS) $(NETPBMLIB) $(LIBOPT)
-	$(LD) -o $@ $(PAMX_OBJECTS) \
-	  $(shell $(LIBOPT) $(NETPBMLIB) $(X11_LIBOPTS)) \
-	  $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD)
+pamx: image.o send.o window.o
+pamx: ADDL_OBJECTS = image.o send.o window.o
+pamx: LDFLAGS_TARGET = $(X11_LIBOPTS)
-- 
cgit 1.4.1