[gnome-autoar/wip/lantw/autoar-0.2] general: Move files related to GTK+ to a separate directory
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-autoar/wip/lantw/autoar-0.2] general: Move files related to GTK+ to a separate directory
- Date: Sun, 5 Feb 2017 17:44:25 +0000 (UTC)
commit 0cc866e5c13f3d169284853ac3513c67207a5d41
Author: Ting-Wei Lan <lantw src gnome org>
Date: Mon Feb 6 01:09:34 2017 +0800
general: Move files related to GTK+ to a separate directory
libgnome-autoar-gtk is a library using libgnome-autoar API.
libgnome-autoar-gtk doesn't have access to internal things of
libgnome-autoar and should be treated as a library independent of
libgnome-autoar. Therefore, it is better to move libgnome-autoar-gtk to
its own directory to avoid confusion.
Makefile.am | 56 ++++++++++----------
configure.ac | 2 +-
docs/reference/Makefile.am | 8 ++--
.../autoar-gtk-chooser.c | 2 +-
.../autoar-gtk-chooser.h | 2 +-
.../gnome-autoar-gtk.h | 2 +-
.../gnome-autoar-gtk.pc.in | 0
tools/autoar-gtk.c | 2 +-
8 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1252983..a04484a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,10 +43,10 @@ libgnome_autoar_la_generated_files = \
gnome-autoar/autoar-enum-types.c \
$(NULL)
libgnome_autoar_gtk_la_headers = \
- gnome-autoar/autoar-gtk-chooser.h \
+ gnome-autoar-gtk/autoar-gtk-chooser.h \
$(NULL)
libgnome_autoar_gtk_la_sources = \
- gnome-autoar/autoar-gtk-chooser.c \
+ gnome-autoar-gtk/autoar-gtk-chooser.c \
$(NULL)
BUILT_SOURCES += \
@@ -91,32 +91,32 @@ gnome_autoar_libgnome_autoar_@API_VERSION@_la_LIBADD = \
if ENABLE_GTK
-lib_LTLIBRARIES += gnome-autoar/libgnome-autoar-gtk-@API_VERSION@.la
-nodist_pkgconfig_DATA += gnome-autoar/gnome-autoar-gtk-@API_VERSION@.pc
+lib_LTLIBRARIES += gnome-autoar-gtk/libgnome-autoar-gtk-@API_VERSION@.la
+nodist_pkgconfig_DATA += gnome-autoar-gtk/gnome-autoar-gtk-@API_VERSION@.pc
-autoargtkincludedir = $(includedir)/gnome-autoar-@API_VERSION@/gnome-autoar
+autoargtkincludedir = $(includedir)/gnome-autoar-@API_VERSION@/gnome-autoar-gtk
autoargtkinclude_HEADERS = \
- gnome-autoar/autoar-gtk.h \
+ gnome-autoar-gtk/gnome-autoar-gtk.h \
$(libgnome_autoar_gtk_la_headers) \
$(NULL)
-gnome_autoar_libgnome_autoar_gtk_@API_VERSION@_la_SOURCES = \
+gnome_autoar_gtk_libgnome_autoar_gtk_@API_VERSION@_la_SOURCES = \
$(libgnome_autoar_gtk_la_headers) \
$(libgnome_autoar_gtk_la_sources) \
$(NULL)
-gnome_autoar_libgnome_autoar_gtk_@API_VERSION@_la_CPPFLAGS = \
+gnome_autoar_gtk_libgnome_autoar_gtk_@API_VERSION@_la_CPPFLAGS = \
$(AM_CPPFLAGS)
$(NULL)
-gnome_autoar_libgnome_autoar_gtk_@API_VERSION@_la_CFLAGS = \
+gnome_autoar_gtk_libgnome_autoar_gtk_@API_VERSION@_la_CFLAGS = \
$(GTK_CFLAGS) \
-I$(top_srcdir) \
- -I$(top_builddir)/gnome-autoar \
+ -I$(top_builddir)/gnome-autoar-gtk \
$(AM_CFLAGS) \
$(NULL)
-gnome_autoar_libgnome_autoar_gtk_@API_VERSION@_la_LDFLAGS = \
+gnome_autoar_gtk_libgnome_autoar_gtk_@API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \
$(NULL)
-gnome_autoar_libgnome_autoar_gtk_@API_VERSION@_la_LIBADD = \
+gnome_autoar_gtk_libgnome_autoar_gtk_@API_VERSION@_la_LIBADD = \
$(GTK_LIBS) \
$(top_builddir)/gnome-autoar/libgnome-autoar-@API_VERSION@.la \
$(NULL)
@@ -130,7 +130,7 @@ gnome-autoar/autoar-enum-types.c: gnome-autoar/autoar-enum-types.c.template $(li
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(BUILT_SOURCES) \
- gnome-autoar/gnome-autoar-gtk-@API_VERSION@.pc \
+ gnome-autoar-gtk/gnome-autoar-gtk-@API_VERSION@.pc \
gnome-autoar/gnome-autoar-@API_VERSION@.pc
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
@@ -163,14 +163,14 @@ gnome_autoar_GnomeAutoar_@API_VERSION_U@_gir_FILES = \
if ENABLE_GTK
-INTROSPECTION_GIRS += gnome-autoar/GnomeAutoarGtk-@API_VERSION@.gir
+INTROSPECTION_GIRS += gnome-autoar-gtk/GnomeAutoarGtk-@API_VERSION@.gir
-gnome-autoar/GnomeAutoarGtk-@API_VERSION@.gir: gnome-autoar/libgnome-autoar-gtk-@API_VERSION@.la
gnome-autoar/GnomeAutoar-@API_VERSION@.gir
-gnome_autoar_GnomeAutoarGtk_@API_VERSION_U@_gir_SCANNERFLAGS = --identifier-prefix=AutoarGtk
--c-include="gnome-autoar/autoar-gtk.h"
-gnome_autoar_GnomeAutoarGtk_@API_VERSION_U@_gir_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
-gnome_autoar_GnomeAutoarGtk_@API_VERSION_U@_gir_INCLUDES = GnomeAutoar-@API_VERSION@ Gtk-3.0
-gnome_autoar_GnomeAutoarGtk_@API_VERSION_U@_gir_LIBS = gnome-autoar/libgnome-autoar-gtk-@API_VERSION@.la
-gnome_autoar_GnomeAutoarGtk_@API_VERSION_U@_gir_FILES = \
+gnome-autoar-gtk/GnomeAutoarGtk-@API_VERSION@.gir: gnome-autoar-gtk/libgnome-autoar-gtk-@API_VERSION@.la
gnome-autoar/GnomeAutoar-@API_VERSION@.gir
+gnome_autoar_gtk_GnomeAutoarGtk_@API_VERSION_U@_gir_SCANNERFLAGS = --identifier-prefix=AutoarGtk
--c-include="gnome-autoar-gtk/gnome-autoar-gtk.h"
+gnome_autoar_gtk_GnomeAutoarGtk_@API_VERSION_U@_gir_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
+gnome_autoar_gtk_GnomeAutoarGtk_@API_VERSION_U@_gir_INCLUDES = GnomeAutoar-@API_VERSION@ Gtk-3.0
+gnome_autoar_gtk_GnomeAutoarGtk_@API_VERSION_U@_gir_LIBS =
gnome-autoar-gtk/libgnome-autoar-gtk-@API_VERSION@.la
+gnome_autoar_gtk_GnomeAutoarGtk_@API_VERSION_U@_gir_FILES = \
$(libgnome_autoar_gtk_la_headers) \
$(libgnome_autoar_gtk_la_sources) \
$(NULL)
@@ -189,15 +189,15 @@ gnome_autoar_gnome_autoar_@API_VERSION_U@_vapi_METADATADIRS = $(srcdir)/gnome-au
gnome_autoar_gnome_autoar_@API_VERSION_U@_vapi_FILES = gnome-autoar/GnomeAutoar-@API_VERSION@.gir
if ENABLE_GTK
-gnome-autoar/gnome-autoar-gtk-@API_VERSION@.vapi: gnome-autoar/GnomeAutoarGtk-@API_VERSION@.gir
gnome-autoar/gnome-autoar-@API_VERSION@.vapi
+gnome-autoar-gtk/gnome-autoar-gtk-@API_VERSION@.vapi: gnome-autoar-gtk/GnomeAutoarGtk-@API_VERSION@.gir
gnome-autoar/gnome-autoar-@API_VERSION@.vapi
-VAPIGEN_VAPIS += gnome-autoar/gnome-autoar-gtk-@API_VERSION@.vapi
+VAPIGEN_VAPIS += gnome-autoar-gtk/gnome-autoar-gtk-@API_VERSION@.vapi
-gnome_autoar_gnome_autoar_gtk_@API_VERSION_U@_vapi_DEPS = gnome-autoar-@API_VERSION@ gtk+-3.0
-gnome_autoar_gnome_autoar_gtk_@API_VERSION_U@_vapi_VAPIDIRS = $(builddir)/gnome-autoar
-gnome_autoar_gnome_autoar_gtk_@API_VERSION_U@_vapi_METADATADIRS = $(srcdir)/gnome-autoar
-gnome_autoar_gnome_autoar_gtk_@API_VERSION_U@_vapi_FILES = gnome-autoar/GnomeAutoarGtk-@API_VERSION@.gir
-gnome_autoar_gnome_autoar_gtk_@API_VERSION_U@_vapi_GIRDIRS = $(builddir)/gnome-autoar
+gnome_autoar_gtk_gnome_autoar_gtk_@API_VERSION_U@_vapi_DEPS = gnome-autoar-@API_VERSION@ gtk+-3.0
+gnome_autoar_gtk_gnome_autoar_gtk_@API_VERSION_U@_vapi_VAPIDIRS = $(builddir)/gnome-autoar
+gnome_autoar_gtk_gnome_autoar_gtk_@API_VERSION_U@_vapi_METADATADIRS = $(srcdir)/gnome-autoar
+gnome_autoar_gtk_gnome_autoar_gtk_@API_VERSION_U@_vapi_FILES =
gnome-autoar-gtk/GnomeAutoarGtk-@API_VERSION@.gir
+gnome_autoar_gtk_gnome_autoar_gtk_@API_VERSION_U@_vapi_GIRDIRS = $(builddir)/gnome-autoar
endif
vapidir = $(datadir)/vala/vapi
@@ -238,7 +238,7 @@ test_gtk_cflags = \
test_gtk_libs = \
$(GTK_LIBS) \
- $(top_builddir)/gnome-autoar/libgnome-autoar-gtk-@API_VERSION@.la \
+ $(top_builddir)/gnome-autoar-gtk/libgnome-autoar-gtk-@API_VERSION@.la \
$(top_builddir)/gnome-autoar/libgnome-autoar-@API_VERSION@.la \
$(NULL)
diff --git a/configure.ac b/configure.ac
index b30831f..0934007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ AC_CONFIG_FILES([Makefile
docs/Makefile
docs/reference/Makefile
gnome-autoar/gnome-autoar-$API_VERSION.pc:gnome-autoar/gnome-autoar.pc.in
- gnome-autoar/gnome-autoar-gtk-$API_VERSION.pc:gnome-autoar/gnome-autoar-gtk.pc.in])
+ gnome-autoar-gtk/gnome-autoar-gtk-$API_VERSION.pc:gnome-autoar-gtk/gnome-autoar-gtk.pc.in])
AS_MKDIR_P([data])
AC_OUTPUT
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 6e52633..7abcad6 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -9,13 +9,13 @@ DOC_MODULE=gnome-autoar-@API_VERSION@
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
MKDB_OPTIONS=--xml-mode --output-format=xml
-DOC_SOURCE_DIR=$(top_srcdir)/gnome-autoar
-HFILE_GLOB=$(top_srcdir)/gnome-autoar/*.h
-CFILE_GLOB=$(top_srcdir)/gnome-autoar/*.c
+DOC_SOURCE_DIR=$(top_srcdir)/gnome-autoar $(top_srcdir)/gnome-autoar-gtk
+HFILE_GLOB=$(top_srcdir)/gnome-autoar/*.h $(top_srcdir)/gnome-autoar-gtk/*.h
+CFILE_GLOB=$(top_srcdir)/gnome-autoar/*.c $(top_srcdir)/gnome-autoar-gtk/*.c
IGNORE_HFILES = \
gnome-autoar.h \
- autoar-gtk.h \
+ gnome-autoar-gtk.h \
autoar-enum-types.h \
autoar-private.h \
$(NULL)
diff --git a/gnome-autoar/autoar-gtk-chooser.c b/gnome-autoar-gtk/autoar-gtk-chooser.c
similarity index 99%
rename from gnome-autoar/autoar-gtk-chooser.c
rename to gnome-autoar-gtk/autoar-gtk-chooser.c
index 60b4012..055201a 100644
--- a/gnome-autoar/autoar-gtk-chooser.c
+++ b/gnome-autoar-gtk/autoar-gtk-chooser.c
@@ -36,7 +36,7 @@
* SECTION:autoar-gtk-chooser
* @Short_description: GTK+ widgets to choose archive format and filter
* @Title: autoar-gtk-chooser
- * @Include: gnome-autoar/autoar-gtk.h
+ * @Include: gnome-autoar-gtk/gnome-autoar-gtk.h
*
* autoar-gtk-chooser contains two widgets for users to choose preferred
* archive format and filter.
diff --git a/gnome-autoar/autoar-gtk-chooser.h b/gnome-autoar-gtk/autoar-gtk-chooser.h
similarity index 97%
rename from gnome-autoar/autoar-gtk-chooser.h
rename to gnome-autoar-gtk/autoar-gtk-chooser.h
index 8600eaa..e5fd805 100644
--- a/gnome-autoar/autoar-gtk-chooser.h
+++ b/gnome-autoar-gtk/autoar-gtk-chooser.h
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
-#include "autoar-format-filter.h"
+#include <gnome-autoar/gnome-autoar.h>
G_BEGIN_DECLS
diff --git a/gnome-autoar/autoar-gtk.h b/gnome-autoar-gtk/gnome-autoar-gtk.h
similarity index 95%
rename from gnome-autoar/autoar-gtk.h
rename to gnome-autoar-gtk/gnome-autoar-gtk.h
index 44337f8..3df17da 100644
--- a/gnome-autoar/autoar-gtk.h
+++ b/gnome-autoar-gtk/gnome-autoar-gtk.h
@@ -26,6 +26,6 @@
#ifndef AUTOARCHIVE_GTK_H
#define AUTOARCHIVE_GTK_H
-#include <gnome-autoar/autoar-gtk-chooser.h>
+#include <gnome-autoar-gtk/autoar-gtk-chooser.h>
#endif /* AUTOARCHIVE_GTK_H */
diff --git a/gnome-autoar/gnome-autoar-gtk.pc.in b/gnome-autoar-gtk/gnome-autoar-gtk.pc.in
similarity index 100%
rename from gnome-autoar/gnome-autoar-gtk.pc.in
rename to gnome-autoar-gtk/gnome-autoar-gtk.pc.in
diff --git a/tools/autoar-gtk.c b/tools/autoar-gtk.c
index b61048f..9e96317 100644
--- a/tools/autoar-gtk.c
+++ b/tools/autoar-gtk.c
@@ -1,7 +1,7 @@
/* vim: set sw=2 ts=2 sts=2 et: */
#include <gnome-autoar/gnome-autoar.h>
-#include <gnome-autoar/autoar-gtk.h>
+#include <gnome-autoar-gtk/gnome-autoar-gtk.h>
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]