Skip to content
Browse files

tools: Reorder dependencies of image2qtree and geoblend

Ubuntu 9.04 couldn't find the dependencies of image2qtree archives. So
putting them up first made everything work.
  • Loading branch information...
1 parent 7f61aa7 commit 733b9e6558e03909237b09e09316dc7863bde5b0 Zack Moratto committed Jan 4, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/vw/tools/Makefile.am
View
8 src/vw/tools/Makefile.am
@@ -106,8 +106,8 @@ image2qtree_ARCHIVES = libimage2qtree_grayau8.a libimage2qtree_grayau16.a \
libimage2qtree_grayai16.a libimage2qtree_grayaf32.a \
libimage2qtree_rgbau8.a libimage2qtree_rgbau16.a \
libimage2qtree_rgbai16.a libimage2qtree_rgbaf32.a
-image2qtree_LDADD = @PKG_CARTOGRAPHY_LIBS@ @PKG_MOSAIC_LIBS@ $(COMMON_LIBS) \
- $(image2qtree_ARCHIVES)
+image2qtree_LDADD = $(image2qtree_ARCHIVES) @PKG_CARTOGRAPHY_LIBS@ \
+ @PKG_MOSAIC_LIBS@ $(COMMON_LIBS)
# The many archive files are to help speed compile times
noinst_LIBRARIES += $(image2qtree_ARCHIVES)
libimage2qtree_grayau8_a_SOURCES = image2qtree_help.cc
@@ -132,8 +132,8 @@ libimage2qtree_rgbaf32_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelRGBA -DCHAN
geoblend_SOURCES = geoblend.cc
geoblend_ARCHIVES = libgeoblend_gray.a libgeoblend_graya.a \
libgeoblend_rgb.a libgeoblend_rgba.a
-geoblend_LDADD = @PKG_CARTOGRAPHY_LIBS@ @PKG_MOSAIC_LIBS@ $(COMMON_LIBS) \
- $(geoblend_ARCHIVES)
+geoblend_LDADD = $(geoblend_ARCHIVES) @PKG_CARTOGRAPHY_LIBS@ \
+ @PKG_MOSAIC_LIBS@ $(COMMON_LIBS)
# The many archive files are to help speed compile times and to lower
# the overall memory requirement during compiling.
noinst_LIBRARIES += $(geoblend_ARCHIVES)

0 comments on commit 733b9e6

Please sign in to comment.
Something went wrong with that request. Please try again.