projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Experiment with plugin configuration screen
[projects/chimara/chimara.git]
/
libchimara
/
Makefile.am
diff --git
a/libchimara/Makefile.am
b/libchimara/Makefile.am
index 2496948200c121a06fc1f64141d04d1625c29450..efb023dde1e030c7588c5903daa76043876f3f66 100644
(file)
--- a/
libchimara/Makefile.am
+++ b/
libchimara/Makefile.am
@@
-4,12
+4,6
@@
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libchimara.la
lib_LTLIBRARIES = libchimara.la
-if TARGET_ILIAD
-pluginpath = "../interpreters"
-else
-pluginpath = $(pkglibdir)
-endif
-
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
@@
-42,10
+36,10
@@
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"\" \
-DG_LOG_DOMAIN=\"Chimara\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
- -DPLUGINDIR=\""$(p
luginpath
)"\" \
+ -DPLUGINDIR=\""$(p
kglibdir
)"\" \
-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
-I$(top_srcdir)
libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
-I$(top_srcdir)
libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
@@
-84,7
+78,7
@@
introspection_sources = \
chimara-if.c chimara-if.h
Chimara-1.0.gir: libchimara.la
chimara-if.c chimara-if.h
Chimara-1.0.gir: libchimara.la
-Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-
2
.0
+Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-
3
.0
Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
Chimara_1_0_gir_LIBS = libchimara.la
Chimara_1_0_gir_FILES = $(introspection_sources)
Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
Chimara_1_0_gir_LIBS = libchimara.la
Chimara_1_0_gir_FILES = $(introspection_sources)
@@
-105,9
+99,14
@@
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
GITIGNOREFILES = Chimara-1.0.gir Chimara-1.0.typelib
endif
GITIGNOREFILES = Chimara-1.0.gir Chimara-1.0.typelib
-# Currently, install the Vala VAPI file statically - generation is broken?
-
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+-3.0 Chimara-1.0.gir && \
+ touch $@
+endif
+
+MAINTAINERCLEANFILES = chimara.vapi
-include $(top_srcdir)/git.mk
-include $(top_srcdir)/git.mk