[gnome-themes-standard] build: simplify and modernize build system
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] build: simplify and modernize build system
- Date: Mon, 15 Oct 2012 21:53:29 +0000 (UTC)
commit 6bcecae4f65f2577e89b4766d17b5d977f093432
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Oct 15 17:50:29 2012 -0400
build: simplify and modernize build system
Make the GTK2/GTK3 checks more consistent and simplify directory
structure.
Makefile.am | 2 +-
configure.ac | 29 ++++++++++------------
src/Makefile.am | 24 ------------------
src/engine.symbols | 3 --
themes/Adwaita/Makefile.am | 8 ++++-
themes/Adwaita/gtk-2.0/Makefile.am | 2 -
themes/Adwaita/gtk-3.0/Makefile.am | 12 +++++++++
{src => themes/Adwaita/gtk-3.0}/adwaita_engine.c | 0
{src => themes/Adwaita/gtk-3.0}/adwaita_utils.c | 0
{src => themes/Adwaita/gtk-3.0}/adwaita_utils.h | 0
themes/HighContrast/Makefile.am | 5 ++-
11 files changed, 35 insertions(+), 50 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bae8b26..95c43e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src themes po
+SUBDIRS = themes po
MAINTAINERCLEANFILES = \
Makefile.in \
diff --git a/configure.ac b/configure.ac
index c49d83d..56d6b90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,25 +29,23 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
AM_GLIB_GNU_GETTEXT
-AC_ARG_ENABLE([gtk3-engines],
- AC_HELP_STRING([--disable-gtk3-engines],
- [Disable Gtk+ 3.x engines [default=no]]),
- enable_gtk3=$enableval,
- enable_gtk3=yes)
-AC_MSG_CHECKING([building gtk3 engines])
-AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes")
-AC_MSG_RESULT([$enable_gtk3])
-GTK_VERSION_REQUIRED=3.5.17
+AC_ARG_ENABLE([gtk3-engine],
+ AC_HELP_STRING([--disable-gtk3-engine],
+ [Disable Gtk+ 3.x engine [default=no]]),
+ enable_gtk3_engine=$enableval,
+ enable_gtk3_engine=yes)
+AC_MSG_CHECKING([building gtk3 engine])
+AM_CONDITIONAL(GTK3_ENGINE, test "x$enable_gtk3_engine" = "xyes")
+AC_MSG_RESULT([$enable_gtk3_engine])
-if test "x$enable_gtk3" = "xyes"; then
- PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
+GTK_VERSION_REQUIRED=3.5.17
+if test "x$enable_gtk3_engine" = "xyes"; then
+ PKG_CHECK_MODULES([GTK3_ENGINE], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
PKG_CHECK_MODULES([HIGHCONTRAST], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0])
fi
-AC_SUBST(DEPENDENCIES_CFLAGS)
-AC_SUBST(DEPENDENCIES_LIBS)
-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
-AC_SUBST(GTK_VERSION)
+GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+AC_SUBST(GTK3_VERSION)
GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK2_VERSION)
@@ -100,7 +98,6 @@ themes/HighContrast/gtk-2.0/Makefile
themes/HighContrast/gtk-3.0/Makefile
themes/HighContrast/icons/Makefile
themes/HighContrast/metacity-1/Makefile
-src/Makefile
po/Makefile.in
])
diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am
index 50d98d2..72c609d 100644
--- a/themes/Adwaita/Makefile.am
+++ b/themes/Adwaita/Makefile.am
@@ -1,9 +1,13 @@
-SUBDIRS = backgrounds cursors metacity-1 gtk-2.0
+SUBDIRS = backgrounds cursors metacity-1
-if GTK3
+if GTK3_ENGINE
SUBDIRS += gtk-3.0
endif
+if GTK2_ENGINE
+SUBDIRS += gtk-2.0
+endif
+
THEME_NAME=Adwaita
THEME_IN_FILES=index.theme.in
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 4863025..a003d16 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -1,4 +1,3 @@
-if GTK2_ENGINE
enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
engine_LTLIBRARIES = libadwaita.la
@@ -6,7 +5,6 @@ libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS)
libadwaita_la_SOURCES = adwaita_engine.c
libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS)
-endif
themedir = $(datadir)/themes/Adwaita/gtk-2.0
theme_DATA = gtkrc
diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index 5452dd1..5f0f758 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -1,5 +1,17 @@
SUBDIRS = assets borders
+enginedir = $(libdir)/gtk-3.0/$(GTK3_VERSION)/theming-engines
+engine_LTLIBRARIES =
+engine_LTLIBRARIES += libadwaita.la
+
+libadwaita_la_SOURCES = \
+ adwaita_utils.h \
+ adwaita_utils.c \
+ adwaita_engine.c
+libadwaita_la_CFLAGS = $(GTK3_ENGINE_CFLAGS)
+libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
+libadwaita_la_LIBADD = $(GTK3_ENGINE_LIBS)
+
themedir = $(datadir)/themes/Adwaita/gtk-3.0
theme_DATA = \
gtk.gresource \
diff --git a/src/adwaita_engine.c b/themes/Adwaita/gtk-3.0/adwaita_engine.c
similarity index 100%
rename from src/adwaita_engine.c
rename to themes/Adwaita/gtk-3.0/adwaita_engine.c
diff --git a/src/adwaita_utils.c b/themes/Adwaita/gtk-3.0/adwaita_utils.c
similarity index 100%
rename from src/adwaita_utils.c
rename to themes/Adwaita/gtk-3.0/adwaita_utils.c
diff --git a/src/adwaita_utils.h b/themes/Adwaita/gtk-3.0/adwaita_utils.h
similarity index 100%
rename from src/adwaita_utils.h
rename to themes/Adwaita/gtk-3.0/adwaita_utils.h
diff --git a/themes/HighContrast/Makefile.am b/themes/HighContrast/Makefile.am
index e6a7583..e3e5944 100644
--- a/themes/HighContrast/Makefile.am
+++ b/themes/HighContrast/Makefile.am
@@ -12,13 +12,14 @@ themedir = $(datadir)/themes/$(THEME_NAME)
theme_DATA = index.theme
noinst_PROGRAMS =
-if GTK3
+
+if GTK3_ENGINE
noinst_PROGRAMS += create-highcontrast
-endif
create_highcontrast_SOURCES = create-highcontrast.c
create_highcontrast_CFLAGS = $(HIGHCONTRAST_CFLAGS)
create_highcontrast_LDADD = $(HIGHCONTRAST_LIBS) -lm
+endif
DISTCLEANFILES = index.theme
EXTRA_DIST += index.theme.in index.theme
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]