aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am39
-rw-r--r--src/bookmarks/Makefile.am4
2 files changed, 31 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 960dc9bc8..b6b6c1413 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,8 @@ endif
bin_PROGRAMS = epiphany
+EXTRA_DIST =
+
CXXLD = $(CXX)
LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -54,7 +56,6 @@ INST_H_FILES = \
ephy-window.h
libephymain_la_SOURCES = \
- $(TYPES_SOURCE) \
ephy-activation.c \
ephy-action-helper.c \
ephy-completion-model.c \
@@ -94,6 +95,9 @@ libephymain_la_SOURCES = \
$(INST_H_FILES) \
$(NOINST_H_FILES)
+nodist_libephymain_la_SOURCES = \
+ $(TYPES_SOURCE)
+
if ENABLE_CERTIFICATE_MANAGER
NOINST_H_FILES += \
ephy-cert-manager-dialog.h
@@ -135,9 +139,10 @@ libpyphany_la_SOURCES = \
ephy-python-extension.c \
ephy-python-extension.h \
ephy-python-loader.c \
- ephy-python-loader.h \
- $(BUILT_PYPHANY_SOURCE) \
- $(TYPES_SOURCE)
+ ephy-python-loader.h
+
+nodist_libpyphany_la_SOURCES = \
+ $(BUILT_PYPHANY_SOURCE)
libpyphany_la_CPPFLAGS = \
-I$(top_srcdir)/lib \
@@ -220,7 +225,7 @@ if ENABLE_PYTHON
pydefsdir = $(datadir)/pygtk/2.0/defs
pydefs_DATA = epiphany.defs
-EXTRA_DIST = \
+EXTRA_DIST += \
epiphany.override \
$(pydefs_DATA)
endif
@@ -281,6 +286,16 @@ stamp-ephy-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
&& rm -f xgen-$(@F) \
&& echo timestamp > $(@F)
+ephy-dbus-server-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
+ $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > xgen-$(@F) \
+ && ( cmp -s xgen-$(@F) $(@F) || cp xgen-$(@F) $(@F) ) \
+ && rm -f xgen-$(@F)
+
+ephy-dbus-client-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
+ $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > xgen-$(@F) \
+ && ( cmp -s xgen-$(@F) $(@F) || cp xgen-$(@F) $(@F) ) \
+ && rm -f xgen-$(@F)
+
epiphany.c: epiphany.defs epiphany.override
( cd $(srcdir) && $(PYGTK_CODEGEN) \
--register $(PYGTK_DEFSDIR)/pango-types.defs \
@@ -289,12 +304,6 @@ epiphany.c: epiphany.defs epiphany.override
--override $*.override \
--prefix py$* $(<F) ) > $@
-ephy-dbus-server-bindings.h: $(top_builddir)/data/epiphany-service.xml
- $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > $@
-
-ephy-dbus-client-bindings.h: $(top_builddir)/data/epiphany-service.xml
- $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > $@
-
CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
@@ -471,3 +480,11 @@ check-python-binding:
#check-local: check-python-binding
endif
+
+dist-check-python-binding:
+if !ENABLE_PYTHON
+ @echo "Python bindings must be enabled in order to make dist!"
+ @false
+endif
+
+dist-hook: dist-check-python-binding
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 29c85d9c5..4901a385d 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -28,7 +28,6 @@ NOINST_H_FILES = \
ephy-nodes-cover.h
libephybookmarks_la_SOURCES = \
- $(BUILT_SOURCES) \
ephy-bookmarks.c \
ephy-bookmark-action.c \
ephy-bookmarks-editor.c \
@@ -50,6 +49,9 @@ libephybookmarks_la_SOURCES = \
$(NOINST_H_FILES) \
$(INST_H_FILES)
+nodist_libephybookmarks_la_SOURCES = \
+ $(BUILT_SOURCES)
+
BUILT_SOURCES = $(TYPES_SOURCE)
TYPES_SOURCE = \