aboutsummaryrefslogtreecommitdiff
path: root/graphics/libpano12/files/patch-tools_Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/libpano12/files/patch-tools_Makefile.am')
-rw-r--r--graphics/libpano12/files/patch-tools_Makefile.am33
1 files changed, 13 insertions, 20 deletions
diff --git a/graphics/libpano12/files/patch-tools_Makefile.am b/graphics/libpano12/files/patch-tools_Makefile.am
index d5f1753c091b..3b2fd627497b 100644
--- a/graphics/libpano12/files/patch-tools_Makefile.am
+++ b/graphics/libpano12/files/patch-tools_Makefile.am
@@ -1,35 +1,28 @@
---- tools/Makefile.am.orig Wed Jan 17 10:49:07 2007
-+++ tools/Makefile.am Wed Jan 17 10:51:24 2007
-@@ -24,6 +24,14 @@
- LIN_DEFS =
+--- tools/Makefile.am.orig 2007-07-02 00:16:15.000000000 +0300
++++ tools/Makefile.am 2007-10-08 11:31:50.000000000 +0300
+@@ -20,7 +20,15 @@
+ DAR_DEFS =
endif
+-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
+if HAVE_FREEBSD
-+FBSD_SRC = panoinfo_unix.c
++FBSD_SRC = pano12info_unix.c
+FBSD_DEFS = -D__Ansi__=1
+else
+FBSD_SRC =
+FBSD_DEFS =
+endif
+
- if HAVE_DARWIN
- DAR_SRC = panoinfo_unix.c
- DAR_DEFS = -D__Ansi__=1
-@@ -32,7 +40,7 @@
- DAR_DEFS =
- endif
-
--AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(FBSD_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
++AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
AM_LDFLAGS = -L${top_builddir}
- bin_PROGRAMS = panoinfo PTOptimizer PTmender PTblender PTtiff2psd PTuncrop
-@@ -52,7 +60,7 @@
+ bin_PROGRAMS = pano12info PTOptimizer
+@@ -28,7 +36,7 @@
PTOptimizer_SOURCES = PTOptimizer.c
PTOptimizer_LDADD = -lpano12
--panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
-+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(FBSD_SRC) $(DAR_SRC)
- panoinfo_LDADD = -lpano12
+-pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
++pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
+ pano12info_LDADD = -lpano12
- EXTRA_DIST = makefile.panoinfo.win32 makefile.ptoptimizer.win32 \
+ EXTRA_DIST = makefile.ptoptimizer.win32 PTOptimizer.vcproj \