GNOME.org
 

[gnome-applets] stickynotes: move files to src folder

commit 543f948e6e55d1c26b97b58f43d8454bebfc410d
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Aug 21 12:32:09 2016 +0200

    stickynotes: move files to src folder

 configure.ac                                       |    3 +-
 po/POTFILES.in                                     |    8 ++--
 stickynotes/Makefile.am                            |   41 +----------------
 stickynotes/src/Makefile.am                        |   49 ++++++++++++++++++++
 stickynotes/{ => src}/gsettings.h                  |    0
 stickynotes/{ => src}/stickynotes.c                |    0
 stickynotes/{ => src}/stickynotes.h                |    2 +-
 stickynotes/{ => src}/stickynotes_applet.c         |    0
 stickynotes/{ => src}/stickynotes_applet.h         |    0
 .../{ => src}/stickynotes_applet_callbacks.c       |    0
 .../{ => src}/stickynotes_applet_callbacks.h       |    2 +-
 stickynotes/{ => src}/stickynotes_callbacks.c      |    2 +-
 stickynotes/{ => src}/stickynotes_callbacks.h      |    2 +-
 stickynotes/{ => src}/util.c                       |    0
 stickynotes/{ => src}/util.h                       |    0
 15 files changed, 60 insertions(+), 49 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff69ebc..5a1348e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -729,8 +729,9 @@ AC_CONFIG_FILES([
   netspeed/src/Makefile
   netspeed/Makefile
 
-  stickynotes/help/Makefile
   stickynotes/Makefile
+  stickynotes/src/Makefile
+  stickynotes/help/Makefile
   stickynotes/pixmaps/Makefile
 
   timer/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1f8ad0f..59662cf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -97,11 +97,11 @@ netspeed/src/netspeed.c
 netspeed/src/preferences.c
 [type: gettext/ini]stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
 stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
-stickynotes/stickynotes_applet.c
-stickynotes/stickynotes_applet_callbacks.c
 [type: gettext/glade]stickynotes/stickynotes-applet-menu.xml
-stickynotes/stickynotes.c
-stickynotes/stickynotes_callbacks.c
+stickynotes/src/stickynotes.c
+stickynotes/src/stickynotes_applet.c
+stickynotes/src/stickynotes_applet_callbacks.c
+stickynotes/src/stickynotes_callbacks.c
 [type: gettext/glade]stickynotes/stickynotes-delete-all.ui
 [type: gettext/glade]stickynotes/stickynotes-delete.ui
 [type: gettext/glade]stickynotes/stickynotes-note-menu.xml
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index dd9db88..7527d2c 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = help pixmaps
+SUBDIRS = help pixmaps src
 
 ui_files = stickynotes-applet-menu.xml \
        stickynotes-note-menu.xml
@@ -14,45 +14,6 @@ service_in_files = org.gnome.panel.applet.StickyNotesAppletFactory.service.in
 gsettings_schemas_in_in = org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
 
 if BUILD_STICKYNOTES_APPLET
-stickynotes_applet_CFLAGS = \
-       -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
-       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       -I.                                     \
-       -I$(srcdir)                             \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(LIBWNCK_CFLAGS)                       \
-       $(XML2_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = stickynotes_applet
-
-stickynotes_applet_SOURCES = \
-       util.h \
-       util.c \
-       stickynotes.h \
-       stickynotes_callbacks.h \
-       stickynotes_applet.h \
-       stickynotes_applet_callbacks.h \
-       stickynotes.c \
-       stickynotes_callbacks.c \
-       stickynotes_applet.c \
-       stickynotes_applet_callbacks.c \
-       gsettings.h
-
-stickynotes_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-stickynotes_applet_LDADD =     \
-       $(GNOME_APPLETS_LIBS)   \
-       $(LIBWNCK_LIBS)         \
-       $(X_LIBS)               \
-       $(XML2_LIBS)
 
 builderdir = $(pkgdatadir)/builder
 builder_DATA = $(builder_files)
diff --git a/stickynotes/src/Makefile.am b/stickynotes/src/Makefile.am
new file mode 100644
index 0000000..b38268e
--- /dev/null
+++ b/stickynotes/src/Makefile.am
@@ -0,0 +1,49 @@
+NULL =
+
+if BUILD_STICKYNOTES_APPLET
+
+libexec_PROGRAMS = stickynotes_applet
+
+stickynotes_applet_CFLAGS = \
+       -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
+       -I. \
+       -I$(srcdir) \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBWNCK_CFLAGS) \
+       $(XML2_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+stickynotes_applet_SOURCES = \
+       gsettings.h \
+       stickynotes.c \
+       stickynotes.h \
+       stickynotes_applet.c \
+       stickynotes_applet.h \
+       stickynotes_applet_callbacks.c \
+       stickynotes_applet_callbacks.h \
+       stickynotes_callbacks.c \
+       stickynotes_callbacks.h \
+       util.c \
+       util.h \
+       $(NULL)
+
+stickynotes_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+stickynotes_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(LIBWNCK_LIBS) \
+       $(X_LIBS) \
+       $(XML2_LIBS) \
+       $(NULL)
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/stickynotes/gsettings.h b/stickynotes/src/gsettings.h
similarity index 100%
rename from stickynotes/gsettings.h
rename to stickynotes/src/gsettings.h
diff --git a/stickynotes/stickynotes.c b/stickynotes/src/stickynotes.c
similarity index 100%
rename from stickynotes/stickynotes.c
rename to stickynotes/src/stickynotes.c
diff --git a/stickynotes/stickynotes.h b/stickynotes/src/stickynotes.h
similarity index 99%
rename from stickynotes/stickynotes.h
rename to stickynotes/src/stickynotes.h
index 950225f..0f5c9ef 100644
--- a/stickynotes/stickynotes.h
+++ b/stickynotes/src/stickynotes.h
@@ -20,7 +20,7 @@
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
 #include <libwnck/libwnck.h>
-#include <stickynotes_applet.h>
+#include "stickynotes_applet.h"
 
 typedef struct
 {
diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/src/stickynotes_applet.c
similarity index 100%
rename from stickynotes/stickynotes_applet.c
rename to stickynotes/src/stickynotes_applet.c
diff --git a/stickynotes/stickynotes_applet.h b/stickynotes/src/stickynotes_applet.h
similarity index 100%
rename from stickynotes/stickynotes_applet.h
rename to stickynotes/src/stickynotes_applet.h
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/src/stickynotes_applet_callbacks.c
similarity index 100%
rename from stickynotes/stickynotes_applet_callbacks.c
rename to stickynotes/src/stickynotes_applet_callbacks.c
diff --git a/stickynotes/stickynotes_applet_callbacks.h b/stickynotes/src/stickynotes_applet_callbacks.h
similarity index 98%
rename from stickynotes/stickynotes_applet_callbacks.h
rename to stickynotes/src/stickynotes_applet_callbacks.h
index e97f2b4..078c00f 100644
--- a/stickynotes/stickynotes_applet_callbacks.h
+++ b/stickynotes/src/stickynotes_applet_callbacks.h
@@ -15,7 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stickynotes_applet.h>
+#include "stickynotes_applet.h"
 
 #ifndef __STICKYNOTES_APPLET_CALLBACKS_H__
 #define __STICKYNOTES_APPLET_CALLBACKS_H__
diff --git a/stickynotes/stickynotes_callbacks.c b/stickynotes/src/stickynotes_callbacks.c
similarity index 99%
rename from stickynotes/stickynotes_callbacks.c
rename to stickynotes/src/stickynotes_callbacks.c
index 8c425e3..8a2eee4 100644
--- a/stickynotes/stickynotes_callbacks.c
+++ b/stickynotes/src/stickynotes_callbacks.c
@@ -16,7 +16,7 @@
  */
 
 #include <config.h>
-#include <stickynotes_callbacks.h>
+#include "stickynotes_callbacks.h"
 
 /* Sticky Window Callback : Lock/Unlock the window */
 gboolean
diff --git a/stickynotes/stickynotes_callbacks.h b/stickynotes/src/stickynotes_callbacks.h
similarity index 99%
rename from stickynotes/stickynotes_callbacks.h
rename to stickynotes/src/stickynotes_callbacks.h
index ff69f5a..2f7e067 100644
--- a/stickynotes/stickynotes_callbacks.h
+++ b/stickynotes/src/stickynotes_callbacks.h
@@ -18,7 +18,7 @@
 #ifndef __STICKYNOTES_CALLBACKS_H__
 #define __STICKYNOTES_CALLBACKS_H__
 
-#include <stickynotes.h>
+#include "stickynotes.h"
 
 /* Callbacks for the sticky notes windows */
 gboolean stickynote_toggle_lock_cb(GtkWidget *widget, StickyNote *note);
diff --git a/stickynotes/util.c b/stickynotes/src/util.c
similarity index 100%
rename from stickynotes/util.c
rename to stickynotes/src/util.c
diff --git a/stickynotes/util.h b/stickynotes/src/util.h
similarity index 100%
rename from stickynotes/util.h
rename to stickynotes/src/util.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]