60930ec2c3
Bump to 7.34.0. Signed-off-by: W. Michael Petullo <mike@flyn.org> git-svn-id: svn://svn.openwrt.org/openwrt/packages@38360 3c298f89-4303-0410-b956-a3cf2f4a3e73
53 lines
3.6 KiB
Diff
53 lines
3.6 KiB
Diff
diff -u --recursive vips-7.34.0-vanilla/libvips/Makefile.in vips-7.34.0/libvips/Makefile.in
|
|
--- vips-7.34.0-vanilla/libvips/Makefile.in 2013-06-18 12:41:41.166821516 -0500
|
|
+++ vips-7.34.0/libvips/Makefile.in 2013-06-18 12:45:16.591314640 -0500
|
|
@@ -109,7 +109,7 @@
|
|
video/libvideo.la $(am__DEPENDENCIES_2)
|
|
am_libvips_la_OBJECTS =
|
|
libvips_la_OBJECTS = $(am_libvips_la_OBJECTS)
|
|
-libvips_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
|
+libvips_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
|
$(CXXFLAGS) $(libvips_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
|
@@ -118,11 +118,11 @@
|
|
am__mv = mv -f
|
|
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
+LTCXXCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
CXXLD = $(CXX)
|
|
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
+CXXLINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
|
|
$(LDFLAGS) -o $@
|
|
SOURCES = $(libvips_la_SOURCES) $(nodist_EXTRA_libvips_la_SOURCES)
|
|
@@ -583,11 +583,11 @@
|
|
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
|
|
|
|
dummy2.lo: cimg/dummy2.cc
|
|
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
|
|
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
|
|
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dummy2.Tpo $(DEPDIR)/dummy2.Plo
|
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cimg/dummy2.cc' object='dummy2.lo' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
|
|
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc
|
|
|
|
mostlyclean-libtool:
|
|
-rm -f *.lo
|
|
diff -u --recursive vips-7.34.0-vanilla/libvips/resample/Makefile.in vips-7.34.0/libvips/resample/Makefile.in
|
|
--- vips-7.34.0-vanilla/libvips/resample/Makefile.in 2013-06-18 12:41:41.170821358 -0500
|
|
+++ vips-7.34.0/libvips/resample/Makefile.in 2013-06-18 12:42:06.869807374 -0500
|
|
@@ -415,7 +415,7 @@
|
|
rm -f "$${dir}/so_locations"; \
|
|
done
|
|
libresample.la: $(libresample_la_OBJECTS) $(libresample_la_DEPENDENCIES) $(EXTRA_libresample_la_DEPENDENCIES)
|
|
- $(CXXLINK) $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS)
|
|
+ $(LINK) $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-compile:
|
|
-rm -f *.$(OBJEXT)
|