stuff

libvips/resample/Makefile.am

@@ -1,23 +1,8 @@
-# only build the C++ stuff if it's enabled
+# only build the C++ stuff if ENABLE_CXX
+# you'd think we could just define a couple of variables, but that seems to
+# confuse libtool and make it link the library with g++
+# instead, have two completely different paths
 if ENABLE_CXX
-C_SOURCES = \
-	bicubic.cpp \
-	nohalo.cpp \
-	lbb.cpp \
-	snohalo.cpp \
-	templates.h 
-C_DIST =
-else
-C_SOURCES = 
-C_DIST = \
-	bicubic.cpp \
-	nohalo.cpp \
-	lbb.cpp \
-	snohalo.cpp \
-	templates.h 
-endif
-
-noinst_LTLIBRARIES = libresample.la
 
 libresample_la_SOURCES = \
 	im_affine.c \
@@ -27,9 +12,32 @@ libresample_la_SOURCES = \
 	im_rightshift_size.c \
 	transform.c \
 	resample_dispatch.c \
-	$(C_SOURCES)
+	bicubic.cpp 
+	nohalo.cpp \
+	lbb.cpp \
+	snohalo.cpp \
+	templates.h 
+
+else
+
+libresample_la_SOURCES = \
+	im_affine.c \
+	interpolate.c \
+	im_shrink.c \
+	im_stretch3.c \
+	im_rightshift_size.c \
+	transform.c \
+	resample_dispatch.c 
 
 EXTRA_DIST = \
-	$(C_DIST)
+	bicubic.cpp \
+	nohalo.cpp \
+	lbb.cpp \
+	snohalo.cpp \
+	templates.h 
+
+endif
+
+noinst_LTLIBRARIES = libresample.la
 
 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@