summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-10-06 14:44:24 +0200
committerraveit65 <[email protected]>2015-10-06 14:45:15 +0200
commit9ec94f9857cb3da16176441b0bb6224bcdd1eae8 (patch)
treea44894e71ce161ec2465b903153dd26f73f7aca4
parentd0088f4b8cad01ba03b91421082eb543c6794308 (diff)
downloadeom-9ec94f9857cb3da16176441b0bb6224bcdd1eae8.tar.bz2
eom-9ec94f9857cb3da16176441b0bb6224bcdd1eae8.tar.xz
fix gtk3 build
eom.css was not created by make dist
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am29
2 files changed, 13 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index b941ab1..3654cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,6 @@ case "$with_gtk" in
;;
esac
AC_SUBST(GTK_API_VERSION)
-AM_CONDITIONAL([HAVE_GTK3], [test "x$GTK_API_VERSION" = "x3.0"])
GLIB_REQUIRED=2.36.0
GIO_REQUIRED=2.36.0
diff --git a/data/Makefile.am b/data/Makefile.am
index 67797eb..4d1ce97 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,26 +34,23 @@ ui_DATA = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = eom.pc
-if HAVE_GTK3
-styledir = $(pkgdatadir)
-style_DATA = eom.css
-else
-gtkrcdir = $(pkgdatadir)
-gtkrc_DATA = gtkrc
-endif
-
-EXTRA_DIST = \
- $(gtkrc_DATA) \
- $(ui_DATA) \
- $(convert_DATA) \
- $(DESKTOP_IN_FILES) \
+themedir = $(pkgdatadir)
+theme_DATA = \
+ gtkrc \
+ eom.css
+
+EXTRA_DIST = \
+ $(theme_DATA) \
+ $(ui_DATA) \
+ $(convert_DATA) \
+ $(DESKTOP_IN_FILES) \
$(appdata_in_files)
-CLEANFILES = \
+CLEANFILES = \
$(appdata_DATA)
-DISTCLEANFILES = \
- $(DESKTOP_FILES) \
+DISTCLEANFILES = \
+ $(DESKTOP_FILES) \
$(gsettings_SCHEMAS)
-include $(top_srcdir)/git.mk