Commit 747023dd authored by Vivien Kraus's avatar Vivien Kraus

Merge branch '20-make-the-project-compatible-with-gnome-builder' into 'develop'

Resolve "Make the project compatible with GNOME builder"

Closes #20

See merge request gugurumbe/tarot!19
parents daea2429 5bca02db
Pipeline #98995 failed with stages
in 47 seconds
......@@ -43,6 +43,7 @@ include doc/Makefile.am
include src/Makefile.am
include games/Makefile.am
include icon/Makefile.am
include gnulib.am
AM_CPPFLAGS += \
-DLOCALEDIR="\"$(localedir)\"" \
......
......@@ -42,7 +42,7 @@ $(srcdir)/%reldir%/org-tangle-stamp: %reldir%/tarot.org %reldir%/setup.el
--eval "(defun package-version () \"$(VERSION)\")" \
--file %reldir%/tarot.org \
-f org-babel-tangle
@mv -f $(srcdir)/%reldir%/org-tangle-temp $(srcdir)/$@
@cd $(srcdir) && mv -f %reldir%/org-tangle-temp $@
$(srcdir)/src/main.c \
$(srcdir)/src/tarot-opts.def \
......@@ -54,7 +54,7 @@ $(srcdir)/src/gtk/engine.vala: %reldir%/org-tangle-stamp
*n*) dry=:;; \
esac; \
done; \
if test -f $(srcdir)/$@; then :; else \
if (cd $(srcdir) && test -f $@); then :; else \
$$dry trap 'rm -rf $(srcdir)/%reldir%/org-tangle-lock $(srcdir)/%reldir%/org-tangle-stamp' 1 2 13 15; \
if $$dry mkdir $(srcdir)/%reldir%/org-tangle-lock 2>/dev/null; then \
## This code is being executed by the first process.
......
# distcheck.am
#
# Copyright (C) 2018 Vivien Kraus <vivien@planete-kraus.eu>
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see
# <http://www.gnu.org/licenses/>.
lib-library/libgnulibrary.la:
$(MAKE) $(AM_MAKEFLAGS) -C lib-library
lib-program/libgnuprogram.la:
$(MAKE) $(AM_MAKEFLAGS) -C lib-program
......@@ -54,7 +54,7 @@ $(srcdir)/%reldir%/cardpainter-@LIBTOOL_CURRENT@.0.vapi $(srcdir)/%reldir%/card_
*n*) dry=:;; \
esac; \
done; \
if test -f $(srcdir)/$@; then :; else \
if (cd $(srcdir) && test -f $@); then :; else \
$$dry trap 'rm -rf $(srcdir)/%reldir%/cardpainter-vapi-lock $(srcdir)/%reldir%/cardpainter-vapi-stamp' 1 2 13 15; \
if $$dry mkdir %reldir%/cardpainter-vapi-lock 2>/dev/null; then \
$$dry rm -f $(srcdir)/%reldir%/cardpainter-vapi-stamp || exit 1; \
......
......@@ -90,13 +90,13 @@ $(srcdir)/%reldir%/application-vapi-stamp: %reldir%/tarot_application_without_gu
%reldir%/tarot_application_without_gui.vala \
%reldir%/engine.vala \
src/tarot-@LIBTOOL_CURRENT@.0.vapi \
src/cairo/cardpainter-@LIBTOOL_CURRENT@.0.vapi \
&& touch %reldir%/application.h \
&& touch %reldir%/application-@LIBTOOL_CURRENT@.0.vapi \
&& touch %reldir%/tarot_application_with_gui.c \
&& touch %reldir%/tarot_application_without_gui.c \
&& touch %reldir%/engine.c \
&& touch $@
src/cairo/cardpainter-@LIBTOOL_CURRENT@.0.vapi
@touch $(srcdir)/%reldir%/application.h
@touch $(srcdir)/%reldir%/application-@LIBTOOL_CURRENT@.0.vapi
@touch $(srcdir)/%reldir%/tarot_application_with_gui.c
@touch $(srcdir)/%reldir%/tarot_application_without_gui.c
@touch $(srcdir)/%reldir%/engine.c
@touch $(srcdir)/%reldir%/application-vapi-stamp
$(srcdir)/%reldir%/application-@LIBTOOL_CURRENT@.0.vapi \
$(srcdir)/%reldir%/application.h \
......@@ -109,7 +109,7 @@ $(srcdir)/%reldir%/engine.c: %reldir%/application-vapi-stamp
*n*) dry=:;; \
esac; \
done; \
if test -f $(srcdir)/$@; then :; else \
if (cd $(srcdir) && test -f $@); then :; else \
$$dry trap 'rm -rf $(srcdir)/%reldir%/application-vapi-lock $(srcdir)/%reldir%/application-vapi-stamp' 1 2 13 15; \
if $$dry mkdir %reldir%/application-vapi-lock 2>/dev/null; then \
$$dry rm -f $(srcdir)/%reldir%/application-vapi-stamp || exit 1; \
......
......@@ -27,7 +27,10 @@ $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir: $(include_HEADERS) $(tarotincl
-shared \
-fPIC \
-o %reldir%/libtarot-host.so \
$(INTROSPECTED_SOURCES) \
$$(for source in $(INTROSPECTED_SOURCES) ; \
do \
echo "$(srcdir)/$$source"; \
done) \
$(AM_CPPFLAGS) \
$(AM_CFLAGS) \
$$(pkg-config --cflags --libs gobject-2.0 libxml-2.0 nettle) \
......@@ -43,8 +46,12 @@ $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir: $(include_HEADERS) $(tarotincl
--c-include tarot.h \
--cflags-begin $(AM_CPPFLAGS) $(AM_CFLAGS) -include "config.h" --cflags-end \
--warn-all \
$(include_HEADERS) $(tarotinclude_HEADERS) \
$$(for header in $(include_HEADERS) $(tarotinclude_HEADERS) ; \
do \
echo "$(srcdir)/$$header"; \
done) \
-o $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir-t
@rm %reldir%/libtarot-host.so
@touch $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir-t
@mv $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir-t $(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir
......
......@@ -23,7 +23,6 @@ gicompile_verbose_ = $(gicompile_verbose_@AM_DEFAULT_V@)
gicompile_verbose_0 = @echo "GI-COMPILE" $@;
$(srcdir)/%reldir%/Tarot-@LIBTOOL_CURRENT@.0.typelib: %reldir%/Tarot-@LIBTOOL_CURRENT@.0.gir
$(gicompile_verbose) $(G_IR_COMPILER) \
$(srcdir)/$< > $(srcdir)/$@
$(gicompile_verbose) cd $(srcdir) && $(G_IR_COMPILER) $< > $@
MAINTAINERCLEANFILES += %reldir%/Tarot-*.0.typelib
......@@ -32,7 +32,7 @@ INTROSPECTED_SOURCES += %reldir%/tarot-gobject.c
glib_mkenums_verbose = $(glib_mkenums_verbose_@AM_V@)
glib_mkenums_verbose_ = $(glib_mkenums_verbose_@AM_DEFAULT_V@)
glib_mkenums_0 = @echo "GLIBMKENUMS $@";
glib_mkenums_verbose_0 = @echo "GLIBMKENUMS $@";
$(srcdir)/%reldir%/tarot-enums-stamp: %reldir%/tarot-gobject.h.in %reldir%/tarot-gobject.c.in $(ENUM_HEADER_FILES)
@rm -f $(srcdir)/%reldir%/tarot-enums-temp
......@@ -46,7 +46,7 @@ $(srcdir)/%reldir%/tarot-enums-stamp: %reldir%/tarot-gobject.h.in %reldir%/tarot
--template %reldir%/tarot-gobject.c.in \
$(ENUM_HEADER_FILES) \
> %reldir%/tarot-gobject.c
@mv -f $(srcdir)/%reldir%/tarot-enums-temp $(srcdir)/$@
@cd $(srcdir) && mv -f %reldir%/tarot-enums-temp $@
$(srcdir)/%reldir%/tarot-gobject.h $(srcdir)/%reldir%/tarot-gobject.c: %reldir%/tarot-enums-stamp
@dry=; for f in x $$MAKEFLAGS; do \
......@@ -55,7 +55,7 @@ $(srcdir)/%reldir%/tarot-gobject.h $(srcdir)/%reldir%/tarot-gobject.c: %reldir%/
*n*) dry=:;; \
esac; \
done; \
if test -f $(srcdir)/$@; then :; else \
if (cd $(srcdir) && test -f $@); then :; else \
$$dry trap 'rm -rf $(srcdir)/%reldir%/tarot-enums-lock $(srcdir)/%reldir%/tarot-enums-stamp' 1 2 13 15; \
if $$dry mkdir $(srcdir)/%reldir%/tarot-enums-lock 2>/dev/null; then \
$$dry rm -f $(srcdir)/%reldir%/tarot-enums-stamp; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment