[gnome-control-center] network: Update the script to update from nm-applet again



commit b9d619fb547a982d3a7159d56b53416295293ac8
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 7 16:52:24 2016 +0200

    network: Update the script to update from nm-applet again
    
    Separating out the UI from the backend code.

 panels/network/wireless-security/Makefile.am |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/panels/network/wireless-security/Makefile.am b/panels/network/wireless-security/Makefile.am
index 77457cb..2e8d490 100644
--- a/panels/network/wireless-security/Makefile.am
+++ b/panels/network/wireless-security/Makefile.am
@@ -57,13 +57,15 @@ wireless-security-resources.h: wireless-security.gresource.xml $(resource_files)
        $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name 
wireless_security $<
 
 WIRELESS_SECURITY_DIR=$(top_srcdir)/../network-manager-applet/src/wireless-security
-WIRELESS_SECURITY_FILES=$(NM_APPLET_SOURCES) $(resource_files)
 update-from-nma:
-       FILES="$(WIRELESS_SECURITY_FILES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && 
changed=true ; \
-       patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch ; \
-       patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch ; \
-       git commit -m "network: Update wireless-security from network-manager-applet" $(NM_APPLET_SOURCES); \
-       git commit -m "network: Update wireless-security UI from network-manager-applet" $(resource_files);
+       FILES="$(NM_APPLET_SOURCES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \
+             patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch && \
+             git add $(NM_APPLET_SOURCES) && \
+             git commit -m "network: Update wireless-security from network-manager-applet"
+       FILES="$(resource_files)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \
+             patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch && \
+             git add $(resource_files) && \
+             git commit -m "network: Update wireless-security UI from network-manager-applet"
 
 EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch 
nm-connection-editor-ui-to-network-panel.patch
 


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