[gnome-applets/wip/segeiger/in-process: 3/6] timer: move files to src folder



commit c4686e6a536e9d397c0684ab6d4042c1d0877def
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sat Jul 30 23:25:12 2016 +0200

    timer: move files to src folder

 configure.ac                                |    1 +
 po/POTFILES.in                              |    2 +-
 timer/Makefile.am                           |   24 +--------------------
 timer/src/Makefile.am                       |   30 +++++++++++++++++++++++++++
 timer/{timerapplet.c => src/timer-applet.c} |    0
 5 files changed, 33 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 47d1e82..9766c2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,7 @@ AC_CONFIG_FILES([
   stickynotes/pixmaps/Makefile
 
   timer/Makefile
+  timer/src/Makefile
 
   tracker-search-bar/Makefile
   tracker-search-bar/src/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c510229..895c40e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -110,7 +110,7 @@ stickynotes/stickynotes_callbacks.c
 [type: gettext/glade]stickynotes/stickynotes-properties.ui
 [type: gettext/ini]timer/org.gnome.applets.TimerApplet.panel-applet.in.in
 timer/org.gnome.gnome-applets.timer.gschema.xml.in.in
-timer/timerapplet.c
+timer/src/timerapplet.c
 [type: gettext/ini]tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in
 tracker-search-bar/src/tracker-applet.c
 tracker-search-bar/src/tracker-results-window.c
diff --git a/timer/Makefile.am b/timer/Makefile.am
index 85efeb9..c7f00d6 100644
--- a/timer/Makefile.am
+++ b/timer/Makefile.am
@@ -1,28 +1,6 @@
 NULL =
 
-libexec_PROGRAMS = timer-applet
-
-timer_applet_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(LIBNOTIFY_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-timer_applet_SOURCES = timerapplet.c
-
-timer_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-timer_applet_LDADD = \
-       $(GNOME_APPLETS_LIBS) \
-       $(LIBNOTIFY_LIBS)
+SUBDIRS = src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.TimerApplet.panel-applet.in
diff --git a/timer/src/Makefile.am b/timer/src/Makefile.am
new file mode 100644
index 0000000..16e83d6
--- /dev/null
+++ b/timer/src/Makefile.am
@@ -0,0 +1,30 @@
+NULL =
+
+libexec_PROGRAMS = timer-applet
+
+timer_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+timer_applet_SOURCES = \
+       timer-applet.c \
+       $(NULL)
+
+timer_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+timer_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(LIBNOTIFY_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/timer/timerapplet.c b/timer/src/timer-applet.c
similarity index 100%
rename from timer/timerapplet.c
rename to timer/src/timer-applet.c


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