about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-03-28 23:04:17 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-03-28 23:04:17 +0000
commiteada0c3290dd22afefaf782e384579135a359aed (patch)
treeb454daa9aeb92f6c36fd12ffbf9156ab2590e650
parent6faa79c16b7cba4b1176bb311cca84c3f6b07f4d (diff)
downloadnetpbm-mirror-eada0c3290dd22afefaf782e384579135a359aed.tar.gz
netpbm-mirror-eada0c3290dd22afefaf782e384579135a359aed.tar.xz
netpbm-mirror-eada0c3290dd22afefaf782e384579135a359aed.zip
Add Cameratopam to merge build
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2420 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/cameratopam/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile
index 11ca4e1d..d6207aea 100644
--- a/converter/other/cameratopam/Makefile
+++ b/converter/other/cameratopam/Makefile
@@ -26,11 +26,11 @@ OBJECTS = cameratopam.o $(ADDL_OBJECTS)
 
 camera.o camera.o2: CFLAGS_TARGET = $(HAVE_JPEG_DEFINE)
 
-MERGE_OBJECTS =
+MERGE_OBJECTS = cameratopam.o2 $(ADDL_OBJECTS)
 
 PORTBINARIES = cameratopam
 BINARIES = $(PORTBINARIES)
-MERGEBINARIES = 
+MERGEBINARIES = cameratopam
 SCRIPTS = 
 
 include $(SRCDIR)/common.mk