diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
| commit | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (patch) | |
| tree | 3b763ebf105fc1136ebcac13b7d4dafca114be68 /editor/pamflip/Makefile | |
| parent | 1610a1f6aa54ad1d97926c1d8605720933059df7 (diff) | |
| download | netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.gz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.xz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.zip | |
Reverse messed up commit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor/pamflip/Makefile')
| -rw-r--r-- | editor/pamflip/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/editor/pamflip/Makefile b/editor/pamflip/Makefile index ce3345f1..83e961a7 100644 --- a/editor/pamflip/Makefile +++ b/editor/pamflip/Makefile @@ -13,15 +13,13 @@ SUBDIRS = MERGEBINARIES = pamflip -PORTBINARIES = pamflip - -BINARIES = $(PORTBINARIES) +BINARIES = pamflip SCRIPTS = -ADDL_OBJECTS = pamflip_sse.o +PAMFLIP_OBJECTS = pamflip.o pamflip_sse.o -OBJECTS = pamflip.o $(ADDL_OBJECTS) +OBJECTS = $(PAMFLIP_OBJECTS) MERGE_OBJECTS = $(OBJECTS:%.o=%.o2) @@ -31,6 +29,8 @@ include $(SRCDIR)/common.mk all: $(BINARIES) $(SUBDIRS:%=%/all) pamflip_sse.o pamflip_sse.o2: CFLAGS_TARGET = $(CFLAGS_SSE) -pamflip.o pamflip.o2: CFLAGS_TARGET = $(CFLAGS_SSE) -pamflip:%:%.o $(ADDL_OBJECTS) +pamflip: $(PAMFLIP_OBJECTS) $(NETPBMLIB) $(LIBOPT) + $(LD) -o $@ $(PAMFLIP_OBJECTS) \ + $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) |