[gnome-builder/wip/chergert/libidemm-merge: 4/27] libidemm: add extra defs gen



commit 58d4ec74dfb05caa04e90f0fbfb0f382f3ec6ae7
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Apr 2 12:36:14 2016 +0200

    libidemm: add extra defs gen

 Makefile.am                                        |    2 +-
 libidemm/.gitignore                                |    5 +++
 libidemm/Makefile.am                               |    5 +--
 libidemm/configure.ac                              |    2 +
 libidemm/tools/Makefile.am                         |   13 ++-----
 .../tools/extra_defs_gen/generate_defs_libide.cc   |   33 ++++++++++++++++++++
 6 files changed, 46 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d9d7bdb..144c3ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . build contrib data libide src plugins tools po tests doc help
+SUBDIRS = . build contrib data libide src plugins tools po tests doc help libidemm
 
 INTLTOOL_FILES = \
        intltool-extract.in \
diff --git a/libidemm/.gitignore b/libidemm/.gitignore
index c1dd6b9..ee68cec 100644
--- a/libidemm/.gitignore
+++ b/libidemm/.gitignore
@@ -1,8 +1,13 @@
+libidemmconfig.h
+stamp-h2
+
 /Makefile
 /Makefile.in
 /libidemm/Makefile
 /libidemm/Makefile.in
 /src/Makefile
 /src/Makefile.in
+/tools/extra_defs_gen/.dirstamp
+/tools/extra_defs_gen/generate_defs_libide
 /tools/Makefile
 /tools/Makefile.in
\ No newline at end of file
diff --git a/libidemm/Makefile.am b/libidemm/Makefile.am
index 257d857..87305eb 100644
--- a/libidemm/Makefile.am
+++ b/libidemm/Makefile.am
@@ -14,7 +14,6 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 srcmm_subdirs = libidemm
-pkgconfig_files = $(LIBIDEMM_MODULE_NAME).pc
 libidemm_include_HEADERS = libidemm.h
 
 if MAINTAINER_MODE
@@ -34,9 +33,7 @@ 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 = libide/libidemmconfig.h
+nodist_libidemm_libinclude_HEADERS = libidemmconfig.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_files)
-
-dist_noinst_SCRIPTS = autogen.sh
diff --git a/libidemm/configure.ac b/libidemm/configure.ac
index 876dbdc..d732c1e 100644
--- a/libidemm/configure.ac
+++ b/libidemm/configure.ac
@@ -21,6 +21,8 @@ AS_IF([test x$enable_libidemm != xno],[
 
 AM_CONDITIONAL(ENABLE_LIBIDEMM, test x$enable_libidemm = xyes)
 
+AC_CONFIG_HEADERS([libidemm/libidemmconfig.h])
+
 AC_CONFIG_FILES([libidemm/Makefile])
 AC_CONFIG_FILES([libidemm/libidemm/Makefile])
 AC_CONFIG_FILES([libidemm/src/Makefile])
diff --git a/libidemm/libidemm.h b/libidemm/libidemm.h
new file mode 100644
index 0000000..e69de29
diff --git a/libidemm/libidemmconfig.h.in b/libidemm/libidemmconfig.h.in
new file mode 100644
index 0000000..e69de29
diff --git a/libidemm/tools/Makefile.am b/libidemm/tools/Makefile.am
index dfe6f4e..ff1b535 100644
--- a/libidemm/tools/Makefile.am
+++ b/libidemm/tools/Makefile.am
@@ -2,15 +2,10 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 include $(srcdir)/m4/filelist.am
 
-noinst_PROGRAMS = extra_defs_gen/generate_defs_gst
+noinst_PROGRAMS = extra_defs_gen/generate_defs_libide
 
-extra_defs_gen_generate_plugin_gmmproc_file_SOURCES = \
-       extra_defs_gen/generate_plugin_gmmproc_file.cc
-extra_defs_gen_generate_plugin_gmmproc_file_LDADD = $(GSTREAMERMM_LIBS)
-
-extra_defs_gen_generate_defs_gst_SOURCES = extra_defs_gen/generate_defs_gst.cc
-extra_defs_gen_generate_defs_gst_LDADD = \
+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
 
-AM_CPPFLAGS = -I$(top_builddir) $(LIBIDEMM_CFLAGS)
-AM_CXXFLAGS = $(LIBIDEMM_WXXFLAGS)
+AM_CPPFLAGS = -I$(top_builddir) $(LIBIDE_CFLAGS) $(GLIBMM_CFLAGS) -I../../libide -I../../contrib/pnl
diff --git a/libidemm/tools/extra_defs_gen/generate_defs_libide.cc 
b/libidemm/tools/extra_defs_gen/generate_defs_libide.cc
new file mode 100644
index 0000000..cb98320
--- /dev/null
+++ b/libidemm/tools/extra_defs_gen/generate_defs_libide.cc
@@ -0,0 +1,33 @@
+/* generate_defs_libide.cc
+ *
+ * Copyright (C) 2016 Marcin Kolny <marcin kolny gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
+
+#include <ide.h>
+
+bool libide_type_is_a_pointer(GType gtype)
+{
+  return (gtype_is_a_pointer(gtype));
+}
+
+int main (int argc, char *argv[])
+{
+
+  //  std::cout << get_defs(GTYPE, libide_type_is_a_pointer);
+  return 0;
+}


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