From 2adfca058293a4c84523947f8d804c65eace1e42 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 15 Sep 2010 17:58:48 +0200 Subject: [PATCH] Use non recursive automake for JS Use only one Makefile for all JS module, to make faster builds and to increase maintenability. https://bugzilla.gnome.org/show_bug.cgi?id=629775 --- configure.ac | 4 ---- js/Makefile.am | 49 +++++++++++++++++++++++++++++++++++++++++++- js/misc/Makefile.am | 8 -------- js/perf/Makefile.am | 4 ---- js/prefs/Makefile.am | 4 ---- js/ui/Makefile.am | 40 ------------------------------------ 6 files changed, 48 insertions(+), 61 deletions(-) delete mode 100644 js/misc/Makefile.am delete mode 100644 js/perf/Makefile.am delete mode 100644 js/prefs/Makefile.am delete mode 100644 js/ui/Makefile.am diff --git a/configure.ac b/configure.ac index f3b1a45fb..65a5b6059 100644 --- a/configure.ac +++ b/configure.ac @@ -166,10 +166,6 @@ AC_CONFIG_FILES([ Makefile data/Makefile js/Makefile - js/misc/Makefile - js/ui/Makefile - js/perf/Makefile - js/prefs/Makefile src/Makefile tests/Makefile po/Makefile.in diff --git a/js/Makefile.am b/js/Makefile.am index 142793cf6..f0efa291f 100644 --- a/js/Makefile.am +++ b/js/Makefile.am @@ -1 +1,48 @@ -SUBDIRS = misc ui perf prefs + +jsdir = $(pkgdatadir)/js + +nobase_dist_js_DATA = \ + misc/docInfo.js \ + misc/format.js \ + misc/gnomeSession.js \ + misc/params.js \ + misc/telepathy.js \ + perf/core.js \ + prefs/clockPreferences.js \ + ui/altTab.js \ + ui/appDisplay.js \ + ui/appFavorites.js \ + ui/boxpointer.js \ + ui/calendar.js \ + ui/chrome.js \ + ui/dash.js \ + ui/dnd.js \ + ui/docDisplay.js \ + ui/environment.js \ + ui/extensionSystem.js \ + ui/genericDisplay.js \ + ui/lightbox.js \ + ui/link.js \ + ui/lookingGlass.js \ + ui/magnifier.js \ + ui/magnifierDBus.js \ + ui/main.js \ + ui/messageTray.js \ + ui/notificationDaemon.js \ + ui/overview.js \ + ui/panel.js \ + ui/panelMenu.js \ + ui/placeDisplay.js \ + ui/popupMenu.js \ + ui/runDialog.js \ + ui/scripting.js \ + ui/search.js \ + ui/shellDBus.js \ + ui/statusMenu.js \ + ui/telepathyClient.js \ + ui/tweener.js \ + ui/windowAttentionHandler.js \ + ui/windowManager.js \ + ui/workspace.js \ + ui/workspacesView.js \ + ui/workspaceSwitcherPopup.js \ No newline at end of file diff --git a/js/misc/Makefile.am b/js/misc/Makefile.am deleted file mode 100644 index 9baf8af51..000000000 --- a/js/misc/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -jsmiscdir = $(pkgdatadir)/js/misc - -dist_jsmisc_DATA = \ - docInfo.js \ - format.js \ - gnomeSession.js \ - params.js \ - telepathy.js diff --git a/js/perf/Makefile.am b/js/perf/Makefile.am deleted file mode 100644 index e3dedc0aa..000000000 --- a/js/perf/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -jsperfdir = $(pkgdatadir)/js/perf - -dist_jsperf_DATA = \ - core.js diff --git a/js/prefs/Makefile.am b/js/prefs/Makefile.am deleted file mode 100644 index a1e0c47ff..000000000 --- a/js/prefs/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -jsprefsdir = $(pkgdatadir)/js/prefs - -dist_jsprefs_DATA = \ - clockPreferences.js diff --git a/js/ui/Makefile.am b/js/ui/Makefile.am deleted file mode 100644 index b9b2241c6..000000000 --- a/js/ui/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -jsuidir = $(pkgdatadir)/js/ui - -dist_jsui_DATA = \ - altTab.js \ - appDisplay.js \ - appFavorites.js \ - boxpointer.js \ - calendar.js \ - chrome.js \ - dash.js \ - dnd.js \ - docDisplay.js \ - environment.js \ - extensionSystem.js \ - genericDisplay.js \ - lightbox.js \ - link.js \ - lookingGlass.js \ - magnifier.js \ - magnifierDBus.js \ - main.js \ - messageTray.js \ - notificationDaemon.js \ - overview.js \ - panel.js \ - panelMenu.js \ - placeDisplay.js \ - popupMenu.js \ - runDialog.js \ - scripting.js \ - search.js \ - shellDBus.js \ - statusMenu.js \ - telepathyClient.js \ - tweener.js \ - windowAttentionHandler.js \ - windowManager.js \ - workspacesView.js \ - workspaceSwitcherPopup.js \ - workspace.js