projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
[projects/chimara/chimara.git]
/
libchimara
/
Makefile.am
diff --git
a/libchimara/Makefile.am
b/libchimara/Makefile.am
index f1ef3f4a35bef37afc962277b89adefa391d0826..96d861d7e6ad7909527dba071c3fe32519d64f98 100644
(file)
--- a/
libchimara/Makefile.am
+++ b/
libchimara/Makefile.am
@@
-42,7
+42,7
@@
libchimara_la_SOURCES = \
style.c style.h \
timer.c timer.h \
window.c window.h
style.c style.h \
timer.c timer.h \
window.c window.h
-libchimara_la_CPPFLAGS = \
+libchimara_la_CPPFLAGS =
$(AM_CPPFLAGS)
\
-DG_LOG_DOMAIN=\"Chimara\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DPLUGINDIR=\""$(pluginpath)"\" \
-DG_LOG_DOMAIN=\"Chimara\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DPLUGINDIR=\""$(pluginpath)"\" \
@@
-103,10
+103,16
@@
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
-
-# Currently, install the Vala VAPI file statically - generation is broken?
+GITIGNOREFILES = Chimara-1.0.gir Chimara-1.0.typelib
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = chimara.vapi
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = chimara.vapi
+if BUILDING_VAPI
+chimara.vapi: $(INTROSPECTION_GIRS)
+ $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \
+ touch $@
+endif
+
+MAINTAINERCLEANFILES = chimara.vapi
-include $(top_srcdir)/git.mk
-include $(top_srcdir)/git.mk