GNOME.org
 

[gnome-applets/wip/segeiger/in-process: 21/21] gweather: move files to src folder

commit f0ca3bf77a06d8e76d636e822a3ab64ed70e418e
Author: Sebastian Geiger <sbastig gmx net>
Date:   Wed Sep 7 16:32:34 2016 +0200

    gweather: move files to src folder

 configure.ac                         |    3 +-
 gweather/Makefile.am                 |   40 +--------------------------
 gweather/src/Makefile.am             |   50 ++++++++++++++++++++++++++++++++++
 gweather/{ => src}/gweather-about.c  |    0
 gweather/{ => src}/gweather-about.h  |    0
 gweather/{ => src}/gweather-applet.c |    0
 gweather/{ => src}/gweather-applet.h |    0
 gweather/{ => src}/gweather-dialog.c |    0
 gweather/{ => src}/gweather-dialog.h |    0
 gweather/{ => src}/gweather-pref.c   |    0
 gweather/{ => src}/gweather-pref.h   |    0
 gweather/{ => src}/gweather-xml.c    |    0
 gweather/{ => src}/gweather-xml.h    |    0
 gweather/{ => src}/gweather.h        |    0
 gweather/{ => src}/main.c            |    0
 po/POTFILES.in                       |   10 +++---
 16 files changed, 58 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 33fd0c9..9c5cccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,8 +690,9 @@ AC_CONFIG_FILES([
   geyes/Makefile
   geyes/themes/Makefile
 
-  gweather/help/Makefile
   gweather/Makefile
+  gweather/help/Makefile
+  gweather/src/Makefile
 
   invest-applet/data/art/Makefile
   invest-applet/data/Makefile
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 3c3166e..d7c8140 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -1,44 +1,6 @@
 NULL =
 
-SUBDIRS = help
-
-gweather_applet_2_CFLAGS = \
-       -I$(srcdir)                             \
-       -I$(top_srcdir)                         \
-       -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"   \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       $(DBUS_CFLAGS)                          \
-       $(GNOME_APPLETS_CFLAGS)         \
-       $(DBUS_CFLAGS)                          \
-       $(LIBNOTIFY_CFLAGS)                     \
-       $(LIBGWEATHER_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = gweather-applet-2
-
-gweather_applet_2_SOURCES = \
-       gweather.h \
-       main.c \
-       gweather-about.c gweather-about.h \
-       gweather-pref.c gweather-pref.h \
-       gweather-xml.c gweather-xml.h \
-       gweather-dialog.c gweather-dialog.h \
-       gweather-applet.c gweather-applet.h
-
-gweather_applet_2_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-gweather_applet_2_LDADD =      \
-       $(DBUS_LIBS)            \
-       $(LIBNOTIFY_LIBS)       \
-       $(GNOME_APPLETS_LIBS)   \
-       $(DBUS_LIBS)            \
-       $(GNOME_LIBS2_LIBS)     \
-       $(LIBGWEATHER_LIBS)
+SUBDIRS = help src
 
 uidir = $(pkgdatadir)/ui
 ui_DATA = gweather-applet-menu.xml
diff --git a/gweather/src/Makefile.am b/gweather/src/Makefile.am
new file mode 100644
index 0000000..b5fadb5
--- /dev/null
+++ b/gweather/src/Makefile.am
@@ -0,0 +1,50 @@
+NULL =
+
+uidir = $(pkgdatadir)/ui
+
+libexec_PROGRAMS = gweather-applet-2
+
+gweather_applet_2_CFLAGS = \
+       -I$(srcdir) \
+       -I$(top_srcdir) \
+       -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(DBUS_CFLAGS) \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
+       $(LIBGWEATHER_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+gweather_applet_2_SOURCES = \
+       gweather.h \
+       gweather-about.c \
+       gweather-about.h \
+       gweather-pref.c \
+       gweather-pref.h \
+       gweather-xml.c \
+       gweather-xml.h \
+       gweather-dialog.c \
+       gweather-dialog.h \
+       gweather-applet.c \
+       gweather-applet.h \
+       main.c \
+       $(NULL)
+
+gweather_applet_2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+gweather_applet_2_LDADD = \
+       $(DBUS_LIBS) \
+       $(LIBNOTIFY_LIBS) \
+       $(GNOME_APPLETS_LIBS) \
+       $(DBUS_LIBS) \
+       $(GNOME_LIBS2_LIBS) \
+       $(LIBGWEATHER_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/gweather/gweather-about.c b/gweather/src/gweather-about.c
similarity index 100%
rename from gweather/gweather-about.c
rename to gweather/src/gweather-about.c
diff --git a/gweather/gweather-about.h b/gweather/src/gweather-about.h
similarity index 100%
rename from gweather/gweather-about.h
rename to gweather/src/gweather-about.h
diff --git a/gweather/gweather-applet.c b/gweather/src/gweather-applet.c
similarity index 100%
rename from gweather/gweather-applet.c
rename to gweather/src/gweather-applet.c
diff --git a/gweather/gweather-applet.h b/gweather/src/gweather-applet.h
similarity index 100%
rename from gweather/gweather-applet.h
rename to gweather/src/gweather-applet.h
diff --git a/gweather/gweather-dialog.c b/gweather/src/gweather-dialog.c
similarity index 100%
rename from gweather/gweather-dialog.c
rename to gweather/src/gweather-dialog.c
diff --git a/gweather/gweather-dialog.h b/gweather/src/gweather-dialog.h
similarity index 100%
rename from gweather/gweather-dialog.h
rename to gweather/src/gweather-dialog.h
diff --git a/gweather/gweather-pref.c b/gweather/src/gweather-pref.c
similarity index 100%
rename from gweather/gweather-pref.c
rename to gweather/src/gweather-pref.c
diff --git a/gweather/gweather-pref.h b/gweather/src/gweather-pref.h
similarity index 100%
rename from gweather/gweather-pref.h
rename to gweather/src/gweather-pref.h
diff --git a/gweather/gweather-xml.c b/gweather/src/gweather-xml.c
similarity index 100%
rename from gweather/gweather-xml.c
rename to gweather/src/gweather-xml.c
diff --git a/gweather/gweather-xml.h b/gweather/src/gweather-xml.h
similarity index 100%
rename from gweather/gweather-xml.h
rename to gweather/src/gweather-xml.h
diff --git a/gweather/gweather.h b/gweather/src/gweather.h
similarity index 100%
rename from gweather/gweather.h
rename to gweather/src/gweather.h
diff --git a/gweather/main.c b/gweather/src/main.c
similarity index 100%
rename from gweather/main.c
rename to gweather/src/main.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 03213cc..6f4653c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,12 +43,12 @@ geyes/geyes.c
 [type: gettext/ini]geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in
 geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in
 geyes/themes.c
-gweather/gweather-about.c
-gweather/gweather-applet.c
+gweather/src/gweather-about.c
+gweather/src/gweather-applet.c
+gweather/src/gweather-dialog.c
+gweather/src/gweather-pref.c
+gweather/src/main.c
 [type: gettext/glade]gweather/gweather-applet-menu.xml
-gweather/gweather-dialog.c
-gweather/gweather-pref.c
-gweather/main.c
 [type: gettext/ini]gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in
 gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in
 inhibit/src/inhibit-applet.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]