diff options
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | build/Makefile.am | 7 | ||||
| -rw-r--r-- | ccss-cairo/Makefile.am | 23 | ||||
| -rw-r--r-- | ccss-gtk/Makefile.am | 23 | ||||
| -rw-r--r-- | ccss/Makefile.am | 23 | ||||
| -rw-r--r-- | examples/Makefile.am | 14 |
6 files changed, 71 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index a455e44..43fc450 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ +NULL = + ACLOCAL_AMFLAGS = -I build DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror @@ -9,11 +11,13 @@ DIST_SUBDIRS = \ ccss-cairo \ ccss-cairo-doc \ ccss-gtk \ - examples + examples \ + $(NULL) SUBDIRS = \ - ccss - ccss-doc + ccss \ + ccss-doc \ + $(NULL) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libccss-1.pc @@ -43,5 +47,6 @@ EXTRA_DIST = \ autogen.sh \ libccss-1.pc.in \ libccss-cairo-1.pc.in \ - libccss-gtk-1.pc.in + libccss-gtk-1.pc.in \ + $(NULL) diff --git a/build/Makefile.am b/build/Makefile.am index 1c7dc1d..4af3d38 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,7 +1,8 @@ + NULL = EXTRA_DIST = \ - shave.in \ - shave-libtool.in \ - shave.m4 \ + shave.in \ + shave-libtool.in \ + shave.m4 \ $(NULL) diff --git a/ccss-cairo/Makefile.am b/ccss-cairo/Makefile.am index 9c3236e..c6da168 100644 --- a/ccss-cairo/Makefile.am +++ b/ccss-cairo/Makefile.am @@ -1,22 +1,28 @@ +NULL = + AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(CCSS_CAIRO_CFLAGS) + $(CCSS_CAIRO_CFLAGS) \ + $(NULL) lib_LTLIBRARIES = libccss-cairo-1.la libccss_cairo_1_la_DEPENDENCIES = \ - ccss-cairo.sym + ccss-cairo.sym \ + $(NULL) libccss_cairo_1_la_LDFLAGS = \ -no-undefined \ -version-info $(VERSION_INFO) \ - -export-symbols $(srcdir)/ccss-cairo.sym + -export-symbols $(srcdir)/ccss-cairo.sym \ + $(NULL) libccss_cairo_1_la_LIBADD = \ ../ccss/libccss-1.la \ - $(CCSS_CAIRO_LIBS) + $(CCSS_CAIRO_LIBS) \ + $(NULL) libccss_cairo_1_la_SOURCES = \ $(headers_DATA) \ @@ -34,15 +40,18 @@ libccss_cairo_1_la_SOURCES = \ ccss-cairo-property.c \ ccss-cairo-property.h \ ccss-cairo-style.c \ - ccss-cairo-style.h + ccss-cairo-style.h \ + $(NULL) headersdir = $(includedir)/libccss-1/ccss-cairo headers_DATA = \ ccss-cairo.h \ ccss-cairo-grammar.h \ - ccss-cairo-style.h + ccss-cairo-style.h \ + $(NULL) EXTRA_DIST = \ - ccss-cairo.sym + ccss-cairo.sym \ + $(NULL) diff --git a/ccss-gtk/Makefile.am b/ccss-gtk/Makefile.am index 569ba00..36f8465 100644 --- a/ccss-gtk/Makefile.am +++ b/ccss-gtk/Makefile.am @@ -1,37 +1,46 @@ +NULL = + AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(CCSS_GTK_CFLAGS) + $(CCSS_GTK_CFLAGS) \ + $(NULL) lib_LTLIBRARIES = libccss-gtk-1.la libccss_gtk_1_la_DEPENDENCIES = \ - ccss-gtk.sym + ccss-gtk.sym \ + $(NULL) libccss_gtk_1_la_LDFLAGS = \ -no-undefined \ -version-info $(VERSION_INFO) \ - -export-symbols $(srcdir)/ccss-gtk.sym + -export-symbols $(srcdir)/ccss-gtk.sym \ + $(NULL) libccss_gtk_1_la_LIBADD = \ ../ccss/libccss-1.la \ - $(CCSS_GTK_LIBS) + $(CCSS_GTK_LIBS) \ + $(NULL) libccss_gtk_1_la_SOURCES = \ $(headers_DATA) \ ccss-gtk-grammar.c \ ccss-gtk-property.c \ ccss-gtk-property.h \ - ccss-gtk-stylesheet.c + ccss-gtk-stylesheet.c \ + $(NULL) headersdir = $(includedir)/libccss-1/ccss-gtk headers_DATA = \ ccss-gtk.h \ ccss-gtk-grammar.h \ - ccss-gtk-stylesheet.h + ccss-gtk-stylesheet.h \ + $(NULL) EXTRA_DIST = \ - ccss-gtk.sym + ccss-gtk.sym \ + $(NULL) diff --git a/ccss/Makefile.am b/ccss/Makefile.am index 5e1aec1..98ae6fd 100644 --- a/ccss/Makefile.am +++ b/ccss/Makefile.am @@ -1,21 +1,27 @@ +NULL = + AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(CCSS_CFLAGS) + $(CCSS_CFLAGS) \ + $(NULL) lib_LTLIBRARIES = libccss-1.la libccss_1_la_DEPENDENCIES = \ - ccss.sym + ccss.sym \ + $(NULL) libccss_1_la_LDFLAGS = \ -no-undefined \ -version-info $(VERSION_INFO) \ - -export-symbols $(srcdir)/ccss.sym + -export-symbols $(srcdir)/ccss.sym \ + $(NULL) libccss_1_la_LIBADD = \ - $(CCSS_LIBS) + $(CCSS_LIBS) \ + $(NULL) libccss_1_la_SOURCES = \ $(headers_DATA) \ @@ -50,7 +56,8 @@ libccss_1_la_SOURCES = \ ccss-style.c \ ccss-style-priv.h \ ccss-stylesheet.c \ - ccss-stylesheet-priv.h + ccss-stylesheet-priv.h \ + $(NULL) headersdir = $(includedir)/libccss-1/ccss @@ -69,8 +76,10 @@ headers_DATA = \ ccss-position.h \ ccss-property.h \ ccss-style.h \ - ccss-stylesheet.h + ccss-stylesheet.h \ + $(NULL) EXTRA_DIST = \ - ccss.sym + ccss.sym \ + $(NULL) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7f92180..2baa97c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,13 +1,17 @@ +NULL = + AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(CCSS_EXAMPLES_CFLAGS) + $(CCSS_EXAMPLES_CFLAGS) \ + $(NULL) AM_LDFLAGS = \ ../ccss/libccss-1.la \ ../ccss-cairo/libccss-cairo-1.la \ - $(CCSS_EXAMPLES_LIBS) + $(CCSS_EXAMPLES_LIBS) \ + $(NULL) noinst_PROGRAMS = \ example-1 \ @@ -17,7 +21,8 @@ noinst_PROGRAMS = \ example-4-1 \ example-4-2 \ example-6 \ - example-7 + example-7 \ + $(NULL) if CCSS_WITH_SOUP noinst_PROGRAMS += example-5 @@ -43,5 +48,6 @@ example_7_SOURCES = example-7.c EXTRA_DIST = \ example-3.png \ - example-5.svg + example-5.svg \ + $(NULL) |