From 4a335d6b2be3310da6b64f0e1ed5592a840507d7 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 12 Nov 2016 11:23:39 +0100 Subject: [PATCH] Utilizzo della libreria anche per l'eseguibile. --- .gitignore | 1 + Makefile.am | 2 +- libreria/Makefile.am | 12 +++++- src/Makefile.am | 95 +++----------------------------------------- src/marshal.c | 90 ----------------------------------------- src/marshal.h | 20 ---------- 6 files changed, 17 insertions(+), 203 deletions(-) delete mode 100644 src/marshal.c delete mode 100644 src/marshal.h diff --git a/.gitignore b/.gitignore index d40c7cf..a393b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ stamp-h1 make_installer.sh resources.rc compile +marshal.[ch] \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index db3aa8e..ee74acf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src libreria data docs installers +SUBDIRS = libreria src data docs installers distclean-local: if test "$(srcdir)" = "."; then :; else \ diff --git a/libreria/Makefile.am b/libreria/Makefile.am index 34b27a3..53f9e1f 100644 --- a/libreria/Makefile.am +++ b/libreria/Makefile.am @@ -1,9 +1,11 @@ guidir = $(datadir)/$(PACKAGE)/gui formdir = $(datadir)/$(PACKAGE)/form +imagesdir = $(datadir)/$(PACKAGE)/images AM_CPPFLAGS = $(ORGANIGRAMMA_CFLAGS) \ -DGUIDIR=\""$(guidir)"\" \ -DFORMDIR=\""$(formdir)"\" \ + -DIMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"Organigramma\" \ -DSOLIPA_FOUND=1 @@ -17,9 +19,15 @@ endif lib_LTLIBRARIES = liborganigramma.la +marshal.c: marshal.h ../src/organigramma_marshal.list $(GLIB_GENMARSHAL) + $(GLIB_GENMARSHAL) ../src/organigramma_marshal.list --body --prefix=_organigramma_marshal > $@ + +marshal.h: ../src/organigramma_marshal.list $(GLIB_GENMARSHAL) + $(GLIB_GENMARSHAL) ../src/organigramma_marshal.list --header --prefix=_organigramma_marshal > $@ + liborganigramma_la_SOURCES = \ ../src/commons.c \ - ../src/marshal.c \ + marshal.c \ ../src/nodi.c \ ../src/nodo.c \ ../src/persona.c \ @@ -66,7 +74,7 @@ liborganigramma_la_LDFLAGS = -no-undefined liborganigramma_include_HEADERS = \ ../src/commons.h \ - ../src/marshal.h \ + marshal.h \ ../src/nodi.h \ ../src/nodo.h \ ../src/persona.h \ diff --git a/src/Makefile.am b/src/Makefile.am index ce5622e..c0df1d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,11 @@ guidir = $(datadir)/$(PACKAGE)/gui formdir = $(datadir)/$(PACKAGE)/form +imagesdir = $(datadir)/$(PACKAGE)/images AM_CPPFLAGS = $(ORGANIGRAMMA_CFLAGS) \ -DGUIDIR=\""$(guidir)"\" \ -DFORMDIR=\""$(formdir)"\" \ + -DIMAGESDIR=\""$(imagesdir)"\" \ -DSOLIPA_FOUND=1 LIBS = $(ORGANIGRAMMA_LIBS) \ @@ -20,98 +22,11 @@ endif resources.o: resources.rc $(WINDRES) $^ -o $@ -bin_PROGRAMS = organigramma - -marshal.c: marshal.h organigramma_marshal.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) organigramma_marshal.list --body --prefix=_organigramma_marshal > $@ +LDADD = $(top_builddir)/libreria/liborganigramma.la -marshal.h: organigramma_marshal.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) organigramma_marshal.list --header --prefix=_organigramma_marshal > $@ +bin_PROGRAMS = organigramma -organigramma_SOURCES = \ - commons.c \ - commons.h \ - main.c \ - marshal.c \ - marshal.h \ - nodi.c \ - nodi.h \ - nodo.c \ - nodo.h \ - persona.c \ - persona.h \ - persone.c \ - persone.h \ - personaincarico.c \ - personaincarico.h \ - personanodo.c \ - personanodo.h \ - personanodorecapito.c \ - personanodorecapito.h \ - personarecapito.c \ - personarecapito.h \ - personaufficio.c \ - personaufficio.h \ - personaufficiorecapito.c \ - personaufficiorecapito.h \ - posizioneeconomica.c \ - posizioneeconomica.h \ - posizionieconomiche.c \ - posizionieconomiche.h \ - profiliprofessionali.c \ - profiliprofessionali.h \ - profiloprofessionale.c \ - profiloprofessionale.h \ - ruoli.c \ - ruoli.h \ - ruolo.c \ - ruolo.h \ - struttura.c \ - struttura.h \ - strutturaallegato.c \ - strutturaallegato.h \ - strutturacollegamento.c \ - strutturacollegamento.h \ - strutturaindirizzo.c \ - strutturaindirizzo.h \ - strutture.c \ - strutture.h \ - tipinodo.c \ - tipinodo.h \ - tipiprestazione.c \ - tipiprestazione.h \ - tipirapportolavoro.c \ - tipirapportolavoro.h \ - tipirecapito.c \ - tipirecapito.h \ - tiponodo.c \ - tiponodo.h \ - tipoprestazione.c \ - tipoprestazione.h \ - tiporapportolavoro.c \ - tiporapportolavoro.h \ - tiporecapito.c \ - tiporecapito.h \ - titoli.c \ - titoli.h \ - titolo.c \ - titolo.h \ - uffici.c \ - uffici.h \ - ufficio.c \ - ufficio.h \ - ufficioallegato.c \ - ufficioallegato.h \ - ufficiocollegamento.c \ - ufficiocollegamento.h \ - ufficionodo.c \ - ufficionodo.h \ - ufficioorario.c \ - ufficioorario.h \ - ufficiorecapito.c \ - ufficiorecapito.h \ - ufficiostanza.c \ - ufficiostanza.h +organigramma_SOURCES = main.c if PLATFORM_WIN32 EXTRALDFLAGS=-mconsole -mwindows diff --git a/src/marshal.c b/src/marshal.c deleted file mode 100644 index 05ed980..0000000 --- a/src/marshal.c +++ /dev/null @@ -1,90 +0,0 @@ - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* BOOLEAN:UINT (organigramma_marshal.list:1) */ -void -_organigramma_marshal_BOOLEAN__UINT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__UINT) (gpointer data1, - guint arg_1, - gpointer data2); - GMarshalFunc_BOOLEAN__UINT callback; - GCClosure *cc = (GCClosure*) closure; - gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_BOOLEAN__UINT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_uint (param_values + 1), - data2); - - g_value_set_boolean (return_value, v_return); -} - diff --git a/src/marshal.h b/src/marshal.h deleted file mode 100644 index 31f289f..0000000 --- a/src/marshal.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef ___organigramma_marshal_MARSHAL_H__ -#define ___organigramma_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* BOOLEAN:UINT (organigramma_marshal.list:1) */ -extern void _organigramma_marshal_BOOLEAN__UINT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* ___organigramma_marshal_MARSHAL_H__ */ - -- 2.49.0