diff options
| author | raveit65 <[email protected]> | 2015-10-06 14:44:24 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2015-10-06 14:44:24 +0200 |
| commit | dc13cca7974486749a36a432378a7233d6a924df (patch) | |
| tree | a44894e71ce161ec2465b903153dd26f73f7aca4 | |
| parent | d0088f4b8cad01ba03b91421082eb543c6794308 (diff) | |
| download | eom-dc13cca7974486749a36a432378a7233d6a924df.tar.bz2 eom-dc13cca7974486749a36a432378a7233d6a924df.tar.xz | |
fix gtk3 build
eom.css was not created by make dist
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 29 |
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 |