about summary refs log tree commit diff
path: root/editor/pamflip
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 /editor/pamflip
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 'editor/pamflip')
-rw-r--r--editor/pamflip/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/editor/pamflip/Makefile b/editor/pamflip/Makefile
index 83e961a7..1173fe2b 100644
--- a/editor/pamflip/Makefile
+++ b/editor/pamflip/Makefile
@@ -13,13 +13,15 @@ SUBDIRS =
 
 MERGEBINARIES = pamflip
 
-BINARIES = pamflip
+PORTBINARIES = pamflip
+
+BINARIES = $(PORTBINARIES)
 
 SCRIPTS =
 
-PAMFLIP_OBJECTS = pamflip.o pamflip_sse.o
+ADDL_OBJECTS = pamflip_sse.o
 
-OBJECTS = $(PAMFLIP_OBJECTS)
+OBJECTS = pamflip.o $(ADDL_OBJECTS)
 
 MERGE_OBJECTS = $(OBJECTS:%.o=%.o2)
 
@@ -30,7 +32,4 @@ all: $(BINARIES) $(SUBDIRS:%=%/all)
 
 pamflip_sse.o pamflip_sse.o2: CFLAGS_TARGET = $(CFLAGS_SSE)
 
-pamflip: $(PAMFLIP_OBJECTS) $(NETPBMLIB) $(LIBOPT)
-	$(LD) -o $@ $(PAMFLIP_OBJECTS) \
-	  $(shell $(LIBOPT) $(NETPBMLIB)) \
-	  $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
+pamflip:%:%.o $(ADDL_OBJECTS)