GNOME.org
 

[gnome-builder] libidemm: rename libidemm to idemm

commit ddc04c0645489f46797057b9988290069183aeea
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Tue Apr 5 21:14:50 2016 +0200

    libidemm: rename libidemm to idemm

 configure.ac                             |    4 ++--
 libidemm/.gitignore                      |   16 ++++++++--------
 libidemm/Makefile.am                     |   10 +++++-----
 libidemm/configure.ac                    |   28 ++++++++++++++--------------
 libidemm/{libidemm => idemm}/Makefile.am |    8 ++++----
 libidemm/idemm/filelist.am               |    7 +++++++
 libidemm/{libidemm => idemm}/wrap_init.h |    0
 libidemm/libidemm/filelist.am            |    7 -------
 libidemm/src/Makefile.am                 |   10 +++++-----
 libidemm/src/application.hg              |    2 +-
 libidemm/src/filelist.am                 |    6 +++---
 libidemm/tools/Makefile.am               |    4 ++--
 12 files changed, 51 insertions(+), 51 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 814ba0f..89df22e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ AS_IF([test "x$have_pygobject" = "xyes"],[
 
 
 dnl ***********************************************************************
-dnl Check for libidemm
+dnl Check for idemm
 dnl ***********************************************************************
 m4_include([libidemm/configure.ac])
 
@@ -564,7 +564,7 @@ echo "  Use cross-referencing in API docs .... : ${enable_doc_cross_references}"
 echo ""
 echo " Optional libraries"
 echo ""
-echo "  libidemm.............................. : ${enable_libidemm}"
+echo "  idemm................................. : ${enable_idemm}"
 echo ""
 echo " Scripting"
 echo ""
diff --git a/libidemm/.gitignore b/libidemm/.gitignore
index 87dbeec..19957d4 100644
--- a/libidemm/.gitignore
+++ b/libidemm/.gitignore
@@ -29,14 +29,14 @@ stamp-h2
 /tools/Makefile
 /tools/Makefile.in
 
-# /libidemm
-/libidemm/libidemm-1.0.la
-/libidemm/Makefile
-/libidemm/Makefile.in
-/libidemm/private/
-/libidemm/application.cc
-/libidemm/application.h
-/libidemm/wrap_init.cc
+# /idemm
+/idemm/libidemm-1.0.la
+/idemm/Makefile
+/idemm/Makefile.in
+/idemm/private/
+/idemm/application.cc
+/idemm/application.h
+/idemm/wrap_init.cc
 
 # docs/
 /docs/doc-install.pl
diff --git a/libidemm/Makefile.am b/libidemm/Makefile.am
index fde0058..80ddc95 100644
--- a/libidemm/Makefile.am
+++ b/libidemm/Makefile.am
@@ -13,8 +13,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-srcmm_subdirs = libidemm
-libidemm_include_HEADERS = idemm.h
+srcmm_subdirs = idemm
+idemm_include_HEADERS = idemm.h
 
 if MAINTAINER_MODE
 src_subdirs = src
@@ -31,9 +31,9 @@ endif
 
 SUBDIRS = tools $(src_subdirs) $(srcmm_subdirs) # $(doc_subdirs)
 
-libidemm_includedir = $(includedir)/$(LIBIDEMM_MODULE_NAME)
-libidemm_libincludedir = $(libdir)/$(LIBIDEMM_MODULE_NAME)/include
-nodist_libidemm_libinclude_HEADERS = idemmconfig.h
+idemm_includedir = $(includedir)/$(IDEMM_MODULE_NAME)
+idemm_libincludedir = $(libdir)/$(IDEMM_MODULE_NAME)/include
+nodist_idemm_libinclude_HEADERS = idemmconfig.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_files)
diff --git a/libidemm/configure.ac b/libidemm/configure.ac
index 0960e2f..dd36e16 100644
--- a/libidemm/configure.ac
+++ b/libidemm/configure.ac
@@ -1,10 +1,10 @@
 m4_define([glibmm_required_version], [2.47.3])
 m4_define([gtkmm_required_version], [3.19.12])
 
-AC_SUBST([LIBIDEMM_SO_VERSION], [0:0:0])
+AC_SUBST([IDEMM_SO_VERSION], [0:0:0])
 
 MM_PREREQ([0.9.8])
-MM_INIT_MODULE([libidemm-1.0])
+MM_INIT_MODULE([idemm-1.0])
 
 MM_CONFIG_DOCTOOL_DIR([docs])
 
@@ -13,34 +13,34 @@ MM_ARG_ENABLE_DOCUMENTATION
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir cairomm-1.0 pangomm-1.4 atkmm-1.6 
gtkmm-3.0])
 
-PKG_CHECK_MODULES(LIBIDEMM,  [glibmm-2.4 >= glibmm_required_version
+PKG_CHECK_MODULES(IDEMM,    [glibmm-2.4 >= glibmm_required_version
                              gtkmm-3.0 >= gtkmm_required_version])
 
 
-AC_ARG_ENABLE([libidemm],
-              [AS_HELP_STRING([--enable-libidemm=@<:@yes/no@:>@],
-                              [Build libidemm library (C++ wrapper for libide])],
-              [enable_libidemm=$enableval],
-             [enable_libidemm=auto])
+AC_ARG_ENABLE([idemm],
+              [AS_HELP_STRING([--enable-idemm=@<:@yes/no@:>@],
+                              [Build idemm library (C++ wrapper for libide])],
+              [enable_idemm=$enableval],
+             [enable_idemm=auto])
 
-AS_IF([test x$enable_libidemm != xno],[
+AS_IF([test x$enable_idemm != xno],[
         PKG_CHECK_MODULES(GTKMM,
                          [gtkmm-3.0 >= gtkmm_required_version],
                          [have_gtkmm=yes],
                          [have_gtkmm=no])
 
-         AS_IF([test x$enable_libidemm = xyes && x$have_libidemm = xno],[
-               AC_MSG_ERROR([--enable-libidemm requires gtkmm >= gtkmm_required_version])
+         AS_IF([test x$enable_idemm = xyes && x$have_idemm = xno],[
+               AC_MSG_ERROR([--enable-idemm requires gtkmm >= gtkmm_required_version])
        ])
 
-       enable_libidemm=$have_gtkmm
+       enable_idemm=$have_gtkmm
 ])
 
-AM_CONDITIONAL(ENABLE_LIBIDEMM, test x$enable_libidemm = xyes)
+AM_CONDITIONAL(ENABLE_IDEMM, test x$enable_idemm = xyes)
 
 AC_CONFIG_HEADERS([libidemm/idemmconfig.h])
 
 AC_CONFIG_FILES([libidemm/Makefile])
-AC_CONFIG_FILES([libidemm/libidemm/Makefile])
+AC_CONFIG_FILES([libidemm/idemm/Makefile])
 AC_CONFIG_FILES([libidemm/src/Makefile])
 AC_CONFIG_FILES([libidemm/tools/Makefile])
diff --git a/libidemm/libidemm/Makefile.am b/libidemm/idemm/Makefile.am
similarity index 61%
rename from libidemm/libidemm/Makefile.am
rename to libidemm/idemm/Makefile.am
index 0fb50c3..c0a0b5d 100644
--- a/libidemm/libidemm/Makefile.am
+++ b/libidemm/idemm/Makefile.am
@@ -6,10 +6,10 @@ include $(top_srcdir)/libidemm/compile-binding.am
 local_cppflags = $(binding_includes) $(binding_cppflags) -DLIBIDEMM_BUILD=1
 libide_cflags = $(LIBIDE_CFLAGS) -I$(top_srcdir)/libide -I$(top_srcdir)/contrib/pnl
 
-AM_CPPFLAGS = $(local_cppflags) $(LIBIDEMM_CFLAGS) $(libide_cflags)
+AM_CPPFLAGS = $(local_cppflags) $(IDEMM_CFLAGS) $(libide_cflags)
 
-AM_CXXFLAGS = $(LIBIDEMM_WXXFLAGS)
+AM_CXXFLAGS = $(IDEMM_WXXFLAGS)
 
 libidemm_1_0_la_SOURCES = $(binding_sources)
-libidemm_1_0_la_LDFLAGS = -no-undefined -version-info $(LIBIDEMM_SO_VERSION)
-libidemm_1_0_la_LIBADD  = $(LIBIDEMM_LIBS)
+libidemm_1_0_la_LDFLAGS = -no-undefined -version-info $(IDEMM_SO_VERSION)
+libidemm_1_0_la_LIBADD  = $(IDEMM_LIBS)
diff --git a/libidemm/idemm/filelist.am b/libidemm/idemm/filelist.am
new file mode 100644
index 0000000..d4a17e3
--- /dev/null
+++ b/libidemm/idemm/filelist.am
@@ -0,0 +1,7 @@
+files_built_cc = $(idemm_files_hg:.hg=.cc) wrap_init.cc
+files_built_h  = $(idemm_files_hg:.hg=.h)
+files_built_ph = $(patsubst %.hg,private/%_p.h,$(idemm_files_hg))
+files_extra_cc =
+files_extra_h  = \
+       wrap_init.h
+files_extra_ph =
diff --git a/libidemm/libidemm/wrap_init.h b/libidemm/idemm/wrap_init.h
similarity index 100%
rename from libidemm/libidemm/wrap_init.h
rename to libidemm/idemm/wrap_init.h
diff --git a/libidemm/src/Makefile.am b/libidemm/src/Makefile.am
index 7d29442..b054dc3 100644
--- a/libidemm/src/Makefile.am
+++ b/libidemm/src/Makefile.am
@@ -1,12 +1,12 @@
-binding_name    = libidemm
-wrap_init_flags = --namespace=Ide --parent_dir=libidemm
+binding_name    = idemm
+wrap_init_flags = --namespace=Ide --parent_dir=idemm
 codegen_srcdir  = $(top_srcdir)/libidemm/tools
 
 include $(srcdir)/filelist.am
 include $(top_srcdir)/libidemm/tools/m4/filelist.am
 
-files_defs = $(libidemm_files_defs)
-files_ccg  = $(libidemm_files_ccg)
-files_hg   = $(libidemm_files_hg)
+files_defs = $(idemm_files_defs)
+files_ccg  = $(idemm_files_ccg)
+files_hg   = $(idemm_files_hg)
 
 include $(top_srcdir)/libidemm/generate-binding.am
diff --git a/libidemm/src/application.hg b/libidemm/src/application.hg
index 8c408dc..5dc2b8d 100644
--- a/libidemm/src/application.hg
+++ b/libidemm/src/application.hg
@@ -5,7 +5,7 @@
 
 #include <ide.h>
 
-_DEFS(libidemm, libide)
+_DEFS(idemm, libide)
 _PINCLUDE(gtkmm/private/application_p.h)
 
 namespace Ide {
diff --git a/libidemm/src/filelist.am b/libidemm/src/filelist.am
index a52693b..34703db 100644
--- a/libidemm/src/filelist.am
+++ b/libidemm/src/filelist.am
@@ -1,13 +1,13 @@
 ## This file is part of libidemm.
 
-libidemm_files_defs =          \
+idemm_files_defs =             \
        libide.defs             \
        libide_enums.defs       \
        libide_methods.defs     \
        libide_signals.defs     \
        libide_docs.xml
 
-libidemm_files_hg =            \
+idemm_files_hg =               \
        application.hg
 
-libidemm_files_ccg = $(libidemm_files_hg:.hg=.ccg)
+idemm_files_ccg = $(idemm_files_hg:.hg=.ccg)
diff --git a/libidemm/tools/Makefile.am b/libidemm/tools/Makefile.am
index b9edb15..1b19311 100644
--- a/libidemm/tools/Makefile.am
+++ b/libidemm/tools/Makefile.am
@@ -6,6 +6,6 @@ noinst_PROGRAMS = extra_defs_gen/generate_defs_libide
 
 extra_defs_gen_generate_defs_libide_SOURCES = extra_defs_gen/generate_defs_libide.cc
 extra_defs_gen_generate_defs_libide_LDADD = \
-       $(LIBIDEMM_LIBS) -lglibmm_generate_extra_defs-2.4 -L../../libide -lide-1.0
+       $(IDEMM_LIBS) -lglibmm_generate_extra_defs-2.4 -L../../libide -lide-1.0
 
-AM_CPPFLAGS = -I$(top_builddir) $(LIBIDE_CFLAGS) $(LIBIDEMM_CFLAGS) -I../../libide -I../../contrib/pnl
+AM_CPPFLAGS = -I$(top_builddir) $(LIBIDE_CFLAGS) $(IDEMM_CFLAGS) -I../../libide -I../../contrib/pnl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]