From cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59 Mon Sep 17 00:00:00 2001 From: giraffedata 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/pamx/Makefile | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'other/pamx') 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