[gnome-applets/wip/segeiger/in-process: 7/10] accessx-status: move file to src folder



commit fd9e6953c438ca4f7195a9aa9ef80e0db24843e5
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 14:02:22 2016 +0200

    accessx-status: move file to src folder

 accessx-status/Makefile.am        |   31 +------------------------------
 accessx-status/src/Makefile.am    |   35 +++++++++++++++++++++++++++++++++++
 accessx-status/{ => src}/applet.c |    0
 accessx-status/{ => src}/applet.h |    0
 configure.ac                      |    1 +
 5 files changed, 37 insertions(+), 30 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 79b1adb..cc3f063 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,35 +1,6 @@
 NULL =
 
-SUBDIRS = help pixmaps
-
-libexec_PROGRAMS = accessx-status-applet
-
-accessx_status_applet_CFLAGS = \
-       -DACCESSX_PIXMAPS_DIR=\""$(pkgdatadir)/accessx-status-applet/pixmaps"\" \
-       -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       $(GNOME_APPLETS_CFLAGS) \
-       $(GIO_CFLAGS) \
-       $(GIO_UNIX_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-accessx_status_applet_SOURCES = \
-       applet.c \
-       applet.h
-
-accessx_status_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-accessx_status_applet_LDADD =  \
-       $(GNOME_APPLETS_LIBS)   \
-       $(GIO_LIBS)             \
-       $(GIO_UNIX_LIBS)        \
-       $(X_LIBS) \
-       $(NULL)
+SUBDIRS = help pixmaps src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.AccessxStatusApplet.panel-applet.in
diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am
new file mode 100644
index 0000000..a92ba3d
--- /dev/null
+++ b/accessx-status/src/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+uidir   = $(pkgdatadir)/ui
+
+libexec_PROGRAMS = accessx-status-applet
+
+accessx_status_applet_CFLAGS = \
+       -DACCESSX_PIXMAPS_DIR=\""$(pkgdatadir)/accessx-status-applet/pixmaps"\" \
+       -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GIO_CFLAGS) \
+       $(GIO_UNIX_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+accessx_status_applet_SOURCES = \
+       applet.c \
+       applet.h \
+       $(NULL)
+
+accessx_status_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+accessx_status_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(GIO_LIBS) \
+       $(GIO_UNIX_LIBS) \
+       $(X_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/accessx-status/applet.c b/accessx-status/src/applet.c
similarity index 100%
rename from accessx-status/applet.c
rename to accessx-status/src/applet.c
diff --git a/accessx-status/applet.h b/accessx-status/src/applet.h
similarity index 100%
rename from accessx-status/applet.h
rename to accessx-status/src/applet.h
diff --git a/configure.ac b/configure.ac
index 1050a7e..139bd04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -623,6 +623,7 @@ AC_CONFIG_FILES([
   accessx-status/help/Makefile
   accessx-status/Makefile
   accessx-status/pixmaps/Makefile
+  accessx-status/src/Makefile
 
   battstat/apmlib/Makefile
   battstat/help/Makefile


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