[gnome-applets/wip/segeiger/in-process: 1/10] command: move files to src folder



commit 0b91d64a3a996b34350f3e88c36709e7597559be
Author: Sebastian Geiger <sbastig gmx net>
Date:   Thu Sep 8 12:03:04 2016 +0200

    command: move files to src folder

 command/Makefile.am         |   22 +---------------------
 command/src/Makefile.am     |   28 ++++++++++++++++++++++++++++
 command/{ => src}/command.c |    0
 configure.ac                |    1 +
 4 files changed, 30 insertions(+), 21 deletions(-)
---
diff --git a/command/Makefile.am b/command/Makefile.am
index 63151d6..6259568 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -1,26 +1,6 @@
 NULL =
 
-libexec_PROGRAMS = command-applet
-
-command_applet_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-command_applet_SOURCES = command.c
-
-command_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-command_applet_LDADD = \
-       $(GNOME_APPLETS_LIBS)
+SUBDIRS = src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CommandApplet.panel-applet.in
diff --git a/command/src/Makefile.am b/command/src/Makefile.am
new file mode 100644
index 0000000..35b7d90
--- /dev/null
+++ b/command/src/Makefile.am
@@ -0,0 +1,28 @@
+NULL =
+
+libexec_PROGRAMS = command-applet
+
+command_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+command_applet_SOURCES = \
+       command.c \
+       $(NULL)
+
+command_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+command_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/command/command.c b/command/src/command.c
similarity index 100%
rename from command/command.c
rename to command/src/command.c
diff --git a/configure.ac b/configure.ac
index cecf583..8d820cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,6 +654,7 @@ AC_CONFIG_FILES([
   charpick/Makefile
 
   command/Makefile
+  command/src/Makefile
 
   cpufreq/help/Makefile
   cpufreq/Makefile


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