diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | test/smoke-tests/webview.js | 2 | ||||
| -rw-r--r-- | webhelper/Makefile.am.inc | 10 | ||||
| -rw-r--r-- | webhelper/webhelper.js (renamed from test/smoke-tests/WebHelper.js) | 0 | ||||
| -rw-r--r-- | wikipedia/Makefile.am.inc | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index f7d41d7..80a6476 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,8 +57,10 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @EOS_SDK_API_NAME@.pc DISTCLEANFILES += @EOS_SDK_API_NAME@.pc -# Open Endless Wikipedia SDK library +# SDK sublibraries +gjsmodulesdir = $(datadir)/gjs-1.0 include $(top_srcdir)/wikipedia/Makefile.am.inc +include $(top_srcdir)/webhelper/Makefile.am.inc # # # INTROSPECTION FILES # # # diff --git a/test/smoke-tests/webview.js b/test/smoke-tests/webview.js index 9b84728..98226f3 100644 --- a/test/smoke-tests/webview.js +++ b/test/smoke-tests/webview.js @@ -7,7 +7,7 @@ const Gtk = imports.gi.Gtk; const WebKit = imports.gi.WebKit; // WebHelper.js must be copied somewhere in GJS's imports.searchPath -const WebHelper = imports.WebHelper; +const WebHelper = imports.webhelper; const TEST_APPLICATION_ID = 'com.endlessm.example.test-webview'; diff --git a/webhelper/Makefile.am.inc b/webhelper/Makefile.am.inc new file mode 100644 index 0000000..f7b26b0 --- /dev/null +++ b/webhelper/Makefile.am.inc @@ -0,0 +1,10 @@ +# Copyright 2013 Endless Mobile, Inc. + +# # # INSTALL RULES # # # + +webhelper_sources = webhelper/webhelper.js + +webhelperdir = $(gjsmodulesdir) +dist_webhelper_DATA = \ + $(webhelper_sources) \ + $(NULL) diff --git a/test/smoke-tests/WebHelper.js b/webhelper/webhelper.js index 8b78931..8b78931 100644 --- a/test/smoke-tests/WebHelper.js +++ b/webhelper/webhelper.js diff --git a/wikipedia/Makefile.am.inc b/wikipedia/Makefile.am.inc index 493b539..dd1c5bb 100644 --- a/wikipedia/Makefile.am.inc +++ b/wikipedia/Makefile.am.inc @@ -48,7 +48,7 @@ js_sources = \ wikipedia/WikipediaWebView.js \ $(NULL) -gjsmodulesdir = $(datadir)/gjs-1.0 -nobase_dist_gjsmodules_DATA = \ +wikipediadir = $(gjsmodulesdir) +nobase_dist_wikipedia_DATA = \ $(js_sources) \ $(NULL) |