diff options
Diffstat (limited to 'bindings/vala')
| -rw-r--r-- | bindings/vala/Makefile.am | 13 | ||||
| -rw-r--r-- | bindings/vala/ayatana-appindicator-0.1-custom.vala (renamed from bindings/vala/appindicator-0.1-custom.vala) | 0 | ||||
| -rw-r--r-- | bindings/vala/examples/Makefile.am | 23 | ||||
| -rw-r--r-- | bindings/vala/examples/ayatana-indicator-example.vala (renamed from bindings/vala/examples/indicator-example.vala) | 0 |
4 files changed, 19 insertions, 17 deletions
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am index 703e7a5..2763bc3 100644 --- a/bindings/vala/Makefile.am +++ b/bindings/vala/Makefile.am @@ -16,25 +16,26 @@ VER= endif vapidir = $(datadir)/vala/vapi -vapiprefix = appindicator$(VER)-0.1 +vapiprefix = ayatana-appindicator$(VER)-0.1 vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps DEPS = $(GTKVAPI) $(vapiprefix).deps: echo $(DEPS) > $@ -$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \ - $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \ - appindicator-0.1-custom.vala \ +$(vapiprefix).vapi: $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.gir \ + $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.metadata \ + ayatana-appindicator-0.1-custom.vala \ $(vapiprefix).deps $(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \ - $< $(srcdir)/appindicator-0.1-custom.vala + $< $(srcdir)/ayatana-appindicator-0.1-custom.vala CLEANFILES = $(vapi_DATA) +DISTCLEANFILES = Makefile.in endif endif EXTRA_DIST = \ - appindicator-0.1-custom.vala + ayatana-appindicator-0.1-custom.vala diff --git a/bindings/vala/appindicator-0.1-custom.vala b/bindings/vala/ayatana-appindicator-0.1-custom.vala index 9fa51eb..9fa51eb 100644 --- a/bindings/vala/appindicator-0.1-custom.vala +++ b/bindings/vala/ayatana-appindicator-0.1-custom.vala diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am index 67ad932..315447c 100644 --- a/bindings/vala/examples/Makefile.am +++ b/bindings/vala/examples/Makefile.am @@ -4,36 +4,37 @@ else VER= endif -VALAFILES = indicator-example.vala +VALAFILES = ayatana-indicator-example.vala EXTRA_DIST = $(VALAFILES) VALAFLAGS = \ - --pkg appindicator$(VER)-0.1 \ + --pkg ayatana-appindicator$(VER)-0.1 \ --vapidir=$(top_builddir)/bindings/vala \ --save-temps if HAVE_VALAC -BUILT_SOURCES = indicator-example.c +BUILT_SOURCES = ayatana-indicator-example.c -indicator-example.c: $(VALAFILES) Makefile.am +ayatana-indicator-example.c: $(VALAFILES) Makefile.am $(VALAC) $(VALAFLAGS) -C $< -o $@ - $(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@ + $(SED) -i "s|#include\s*<\s*libayatana-appindicator/app-indicator.h\s*>||g" $@ -nodist_indicator_example_SOURCES = indicator-example.c -indicator_example_CFLAGS = \ +nodist_ayatana_indicator_example_SOURCES = ayatana-indicator-example.c +ayatana_indicator_example_CFLAGS = \ $(LIBRARY_CFLAGS) \ -Wall \ -I$(top_srcdir)/src \ -include $(top_srcdir)/src/app-indicator.h -indicator_example_LDADD = \ +ayatana_indicator_example_LDADD = \ $(LIBRARY_LIBS) \ - $(top_builddir)/src/libappindicator$(VER).la + $(top_builddir)/src/libayatana-appindicator$(VER).la -check_PROGRAMS = indicator-example +check_PROGRAMS = ayatana-indicator-example CLEANFILES = \ *.c \ - indicator-example + ayatana-indicator-example +DISTCLEANFILES = Makefile.in endif diff --git a/bindings/vala/examples/indicator-example.vala b/bindings/vala/examples/ayatana-indicator-example.vala index 764009f..764009f 100644 --- a/bindings/vala/examples/indicator-example.vala +++ b/bindings/vala/examples/ayatana-indicator-example.vala |