[gnome-applets/wip/window-picker-applet] build window-picker-applet



commit 96c92c86f66eaecbf26c696f2172b87aafc0b67b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Sep 18 19:23:14 2014 +0300

    build window-picker-applet

 .gitignore                            |   62 -----------------------------
 Makefile.am                           |    3 +-
 configure.ac                          |    4 ++
 window-picker-applet/Makefile.am      |    2 +
 window-picker-applet/configure.ac     |   70 ---------------------------------
 window-picker-applet/data/Makefile.am |    2 +-
 window-picker-applet/src/Makefile.am  |   10 +++-
 7 files changed, 16 insertions(+), 137 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d3faf18..1dfee05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,8 @@ always_built_SUBDIRS =  \
        geyes           \
        stickynotes     \
        trashapplet     \
-       null_applet
+       null_applet \
+       window-picker-applet
 
 SUBDIRS = \
        po                      \
diff --git a/configure.ac b/configure.ac
index 4319f3b..a0d60eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,6 +699,9 @@ stickynotes/pixmaps/Makefile
 trashapplet/help/Makefile
 trashapplet/Makefile
 trashapplet/src/Makefile
+window-picker-applet/Makefile
+window-picker-applet/data/Makefile
+window-picker-applet/src/Makefile
 ])
 
 dnl ***************************************************************************
@@ -730,6 +733,7 @@ gnome-applets-$VERSION configure summary:
         - multiload                    $build_gtop_applets
         - stickynotes                  $enable_stickynotes
         - trashapplet                  always
+        - window-picker-applet always
 
        Using DBUS:                     $HAVE_DBUS
        Using NetworkManager:           $HAVE_NETWORKMANAGER
diff --git a/window-picker-applet/Makefile.am b/window-picker-applet/Makefile.am
index e6bc8ee..97a836c 100644
--- a/window-picker-applet/Makefile.am
+++ b/window-picker-applet/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = \
        data \
        src
+
+-include $(top_srcdir)/git.mk
diff --git a/window-picker-applet/data/Makefile.am b/window-picker-applet/data/Makefile.am
index a4120ec..2048f80 100644
--- a/window-picker-applet/data/Makefile.am
+++ b/window-picker-applet/data/Makefile.am
@@ -1,4 +1,4 @@
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.WindowPicker.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/window-picker-applet/src/Makefile.am b/window-picker-applet/src/Makefile.am
index fa3b2ae..75e3539 100644
--- a/window-picker-applet/src/Makefile.am
+++ b/window-picker-applet/src/Makefile.am
@@ -2,7 +2,8 @@ libexec_PROGRAMS=window-picker-applet
 
 PKGDATADIR = $(datadir)/window-picker-applet
 AM_CFLAGS=\
-       $(DEPS_CFLAGS)                          \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBWNCK_CFLAGS) \
        $(GCC_FLAGS)                            \
        -I$(top_builddir)                       \
        -I$(top_srcdir)                         \
@@ -15,7 +16,8 @@ AM_CFLAGS=\
     -lm
 
 window_picker_applet_LDADD = \
-       $(DEPS_LIBS)
+       $(GNOME_APPLETS_LIBS) \
+       $(LIBWNCK_LIBS)
 
 window_picker_applet_SOURCES = \
        applet.c \
@@ -24,4 +26,6 @@ window_picker_applet_SOURCES = \
        task-list.c \
        task-list.h \
        task-title.c \
-       task-title.h 
+       task-title.h
+
+-include $(top_srcdir)/git.mk


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