[Kimchi-devel] [wok V3 4/6] Update makefiles to reflect UI changes

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com&gt; --- plugins/kimchi/configure.ac | 4 ---- plugins/kimchi/ui/Makefile.am | 2 +- plugins/kimchi/ui/js/Makefile.am | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac index 843307a..adab45b 100644 --- a/plugins/kimchi/configure.ac +++ b/plugins/kimchi/configure.ac @@ -88,10 +88,6 @@ AC_CONFIG_FILES([ ui/images/Makefile ui/images/theme-default/Makefile ui/js/Makefile - ui/libs/Makefile - ui/libs/themes/Makefile - ui/libs/themes/base/Makefile - ui/libs/themes/base/images/Makefile ui/spice-html5/Makefile ui/spice-html5/css/Makefile ui/spice-html5/pages/Makefile diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am index 386aa78..21fe703 100644 --- a/plugins/kimchi/ui/Makefile.am +++ b/plugins/kimchi/ui/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = config css images js libs pages spice-html5 +SUBDIRS = config css images js pages spice-html5 uidir = $(datadir)/wok/plugins/kimchi/ui diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am index 50f5f77..c9d1218 100644 --- a/plugins/kimchi/ui/js/Makefile.am +++ b/plugins/kimchi/ui/js/Makefile.am @@ -15,13 +15,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -EXTRA_DIST = src widgets +EXTRA_DIST = src jsdir = $(datadir)/wok/plugins/kimchi/ui/js dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js)) -kimchi.min.js: widgets/*.js src/*.js +kimchi.min.js: src/*.js cat $(sort $^) > $@ CLEANFILES = kimchi.min.js -- 1.7.1