diff options
Diffstat (limited to 'boilerplate/Makefile.am')
| -rw-r--r-- | boilerplate/Makefile.am | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am index 29ad015ac..57fec733c 100644 --- a/boilerplate/Makefile.am +++ b/boilerplate/Makefile.am @@ -14,13 +14,7 @@ AM_CPPFLAGS = \ $(NULL) AM_LDFLAGS = $(CAIRO_LDFLAGS) -if BUILD_CXX -cxx_boilerplate_lib = libcairoboilerplate_cxx.la -else -cxx_boilerplate_lib = -endif - -EXTRA_LTLIBRARIES += libcairoboilerplate.la $(cxx_boilerplate_lib) +EXTRA_LTLIBRARIES += libcairoboilerplate.la libcairoboilerplate_la_SOURCES = \ @@ -29,37 +23,23 @@ libcairoboilerplate_la_SOURCES = \ $(enabled_cairo_boilerplate_sources) \ cairo-boilerplate-constructors.c \ $(NULL) -libcairoboilerplate_cxx_la_SOURCES = \ - $(enabled_cairo_boilerplate_cxx_sources) \ - $(NULL) libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la \ - $(cxx_boilerplate_lib) \ - $(CAIRO_LIBS) \ - $(CAIROBOILERPLATE_LIBS) \ - $(NULL) -libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \ $(CAIRO_LIBS) \ $(CAIROBOILERPLATE_LIBS) \ $(NULL) libcairoboilerplate_la_DEPENDENCIES = \ - $(cxx_boilerplate_lib) \ $(NULL) if CAIRO_HAS_DL libcairoboilerplate_la_LIBADD += -ldl endif -if CAIRO_HAS_BEOS_SURFACE -# BeOS system headers trigger this warning -libcairoboilerplate_cxx_la_CXXFLAGS = -Wno-multichar -endif - if CAIRO_HAS_WIN32_SURFACE libcairoboilerplate_la_LIBADD += -lwinspool endif -cairo-boilerplate-constructors.c: Makefile $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources) make-cairo-boilerplate-constructors.sh - (cd $(srcdir) && sh ./make-cairo-boilerplate-constructors.sh $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources)) > $@ +cairo-boilerplate-constructors.c: Makefile $(enabled_cairo_boilerplate_sources) make-cairo-boilerplate-constructors.sh + (cd $(srcdir) && sh ./make-cairo-boilerplate-constructors.sh $(enabled_cairo_boilerplate_sources)) > $@ BUILT_SOURCES += cairo-boilerplate-constructors.c EXTRA_DIST += $(BUILT_SOURCES) make-cairo-boilerplate-constructors.sh |