[gnome-sound-recorder/dbusfixes] makefile changes



commit b64a38952e96e38a80a70d5fc1b15b344e953858
Author: Meg Ford <meg387 gmail com>
Date:   Sun Sep 22 03:21:51 2013 -0500

    makefile changes

 src/Makefile.am |   14 +++++++++++---
 src/main.js     |    8 +-------
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a5e29e4..35a2b8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,11 @@
 NULL = 
  
 nodist_bin_SCRIPTS = $(PACKAGE_TARNAME)
-nodist_pkgdata_SCRIPTS = $(PACKAGE_NAME)
+nodist_pkgdata_SCRIPTS = \
+    org.gnome.SoundRecorder \
+    gnome-sound-recorder \
+    $(NULL)
+    
 
 EXTRA_SCRIPTS = org.gnome.SoundRecorder gnome-sound-recorder
 
@@ -25,7 +29,7 @@ dist_js_DATA = \
     $(NULL)
     
 
-$(PACKAGE_TARNAME): $(PACKAGE_TARNAME).in
+org.gnome.SoundRecorder: org.gnome.SoundRecorder.in
        $(AM_V_GEN) sed \
                -e "s|[ ]GJS@|$(GJS)|g" \
                -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
@@ -47,7 +51,11 @@ $(PACKAGE_NAME): $(PACKAGE_NAME).in
                $< > $@
        @chmod +x $@
 
-EXTRA_DIST = $(PACKAGE_NAME).in 
+EXTRA_DIST = \
+    org.gnome.SoundRecorder.in \
+    $(PACKAGE_NAME).in \
+    $(NULL)
+    
 CLEANFILES = $(PACKAGE_NAME) 
 
 -include $(top_srcdir)/git.mk
diff --git a/src/main.js b/src/main.js
index 4f4e0c7..c7b366f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -47,12 +47,6 @@ const GLib = imports.gi.GLib;
 const MainWindow = imports.mainWindow;
 const Preferences = imports.preferences;
 
-function initEnvironment() {
-    mainWindow.getApp = function() {
-        return Gio.Application.get_default();
-    };
-}
-
 const Application = new Lang.Class({
     Name: 'Application',
     Extends: Gtk.Application,
@@ -107,7 +101,7 @@ const Application = new Lang.Class({
 });
 
 function main(argv) {
-    initEnvironment();
+
 
     return (new Application()).run(argv);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]