From 616c6704af2de2f9f9707050c0ee2bfcfaa45913 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 4 Jul 2011 16:16:45 +0200 Subject: [PATCH] Renamed directories to replicate includedir structure. --- Makefile.am | 2 +- autogen.sh | 4 +-- configure.ac | 22 +++++++------- {src => libgtkform}/Makefile.am | 0 {src => libgtkform}/field.c | 0 {src => libgtkform}/field.h | 0 {src => libgtkform}/fieldboolean.c | 0 {src => libgtkform}/fieldboolean.h | 0 {src => libgtkform}/fielddatetime.c | 0 {src => libgtkform}/fielddatetime.h | 0 {src => libgtkform}/fieldfloat.c | 0 {src => libgtkform}/fieldfloat.h | 0 {src => libgtkform}/fieldinteger.c | 0 {src => libgtkform}/fieldinteger.h | 0 {src => libgtkform}/fieldtext.c | 0 {src => libgtkform}/fieldtext.h | 0 {src => libgtkform}/form.c | 0 {src => libgtkform}/form.h | 0 {src => libgtkform}/group.c | 0 {src => libgtkform}/group.h | 0 {src => libgtkform}/key.c | 0 {src => libgtkform}/key.h | 0 {src => libgtkform}/widget.c | 0 {src => libgtkform}/widget.h | 0 {src => libgtkform}/widgetcheck.c | 0 {src => libgtkform}/widgetcheck.h | 0 {src => libgtkform}/widgetcombobox.c | 0 {src => libgtkform}/widgetcombobox.h | 0 {src => libgtkform}/widgetentry.c | 0 {src => libgtkform}/widgetentry.h | 0 {src => libgtkform}/widgetlabel.c | 0 {src => libgtkform}/widgetlabel.h | 0 {src => libgtkform}/widgetradio.c | 0 {src => libgtkform}/widgetradio.h | 0 {src => libgtkform}/widgetspin.c | 0 {src => libgtkform}/widgetspin.h | 0 {src => libgtkform}/widgettextview.c | 0 {src => libgtkform}/widgettextview.h | 0 {ui => libgtkformui}/Makefile.am | 3 +- {ui => libgtkformui}/glade/Makefile.am | 0 {ui => libgtkformui}/glade/gtkformui.xml | 0 {ui => libgtkformui}/glade/icons/Makefile.am | 0 .../glade/icons/hicolor/16x16/Makefile.am | 0 .../icons/hicolor/16x16/actions/Makefile.am | 0 .../widget-gtkformui-gtkformdecoder.png | Bin .../glade/icons/hicolor/22x22/Makefile.am | 0 .../icons/hicolor/22x22/actions/Makefile.am | 0 .../widget-gtkformui-gtkformdecoder.png | Bin .../glade/icons/hicolor/Makefile.am | 0 {ui => libgtkformui}/gtkformdecoder.c | 0 {ui => libgtkformui}/gtkformdecoder.h | 0 {ui => libgtkformui}/gtkformwidgetdecoder.c | 0 {ui => libgtkformui}/gtkformwidgetdecoder.h | 0 {ui => libgtkformui}/test/Makefile.am | 9 +++--- {ui => libgtkformui}/test/database.db | Bin {ui => libgtkformui}/test/decoder.c | 2 +- test/Makefile.am | 4 +-- test/from_xml.c | 28 +++++++++--------- test/from_xml_with_db.c | 28 +++++++++--------- test/main.c | 28 +++++++++--------- 60 files changed, 65 insertions(+), 65 deletions(-) rename {src => libgtkform}/Makefile.am (100%) rename {src => libgtkform}/field.c (100%) rename {src => libgtkform}/field.h (100%) rename {src => libgtkform}/fieldboolean.c (100%) rename {src => libgtkform}/fieldboolean.h (100%) rename {src => libgtkform}/fielddatetime.c (100%) rename {src => libgtkform}/fielddatetime.h (100%) rename {src => libgtkform}/fieldfloat.c (100%) rename {src => libgtkform}/fieldfloat.h (100%) rename {src => libgtkform}/fieldinteger.c (100%) rename {src => libgtkform}/fieldinteger.h (100%) rename {src => libgtkform}/fieldtext.c (100%) rename {src => libgtkform}/fieldtext.h (100%) rename {src => libgtkform}/form.c (100%) rename {src => libgtkform}/form.h (100%) rename {src => libgtkform}/group.c (100%) rename {src => libgtkform}/group.h (100%) rename {src => libgtkform}/key.c (100%) rename {src => libgtkform}/key.h (100%) rename {src => libgtkform}/widget.c (100%) rename {src => libgtkform}/widget.h (100%) rename {src => libgtkform}/widgetcheck.c (100%) rename {src => libgtkform}/widgetcheck.h (100%) rename {src => libgtkform}/widgetcombobox.c (100%) rename {src => libgtkform}/widgetcombobox.h (100%) rename {src => libgtkform}/widgetentry.c (100%) rename {src => libgtkform}/widgetentry.h (100%) rename {src => libgtkform}/widgetlabel.c (100%) rename {src => libgtkform}/widgetlabel.h (100%) rename {src => libgtkform}/widgetradio.c (100%) rename {src => libgtkform}/widgetradio.h (100%) rename {src => libgtkform}/widgetspin.c (100%) rename {src => libgtkform}/widgetspin.h (100%) rename {src => libgtkform}/widgettextview.c (100%) rename {src => libgtkform}/widgettextview.h (100%) rename {ui => libgtkformui}/Makefile.am (91%) rename {ui => libgtkformui}/glade/Makefile.am (100%) rename {ui => libgtkformui}/glade/gtkformui.xml (100%) rename {ui => libgtkformui}/glade/icons/Makefile.am (100%) rename {ui => libgtkformui}/glade/icons/hicolor/16x16/Makefile.am (100%) rename {ui => libgtkformui}/glade/icons/hicolor/16x16/actions/Makefile.am (100%) rename {ui => libgtkformui}/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png (100%) rename {ui => libgtkformui}/glade/icons/hicolor/22x22/Makefile.am (100%) rename {ui => libgtkformui}/glade/icons/hicolor/22x22/actions/Makefile.am (100%) rename {ui => libgtkformui}/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png (100%) rename {ui => libgtkformui}/glade/icons/hicolor/Makefile.am (100%) rename {ui => libgtkformui}/gtkformdecoder.c (100%) rename {ui => libgtkformui}/gtkformdecoder.h (100%) rename {ui => libgtkformui}/gtkformwidgetdecoder.c (100%) rename {ui => libgtkformui}/gtkformwidgetdecoder.h (100%) rename {ui => libgtkformui}/test/Makefile.am (57%) rename {ui => libgtkformui}/test/database.db (100%) rename {ui => libgtkformui}/test/decoder.c (98%) diff --git a/Makefile.am b/Makefile.am index 24f47f7..011cb4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -SUBDIRS = po src ui test docs data +SUBDIRS = po libgtkform libgtkformui test docs data ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index aa48604..723b7b3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,8 +7,8 @@ test -z "$srcdir" && srcdir=. PKG_NAME="libgtkform" (test -f $srcdir/configure.ac \ - && test -d $srcdir/src \ - && test -f $srcdir/src/form.h) || { + && test -d $srcdir/libgtkform \ + && test -f $srcdir/libgtkform/form.h) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level libgtkform directory" exit 1 diff --git a/configure.ac b/configure.ac index d74cfe1..c895c60 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([libgtkform], [0.3.1], [azagli@libero.it]) -AC_CONFIG_SRCDIR([src/form.c]) +AC_CONFIG_SRCDIR([libgtkform/form.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE(-Wall) @@ -85,9 +85,9 @@ AC_CONFIG_FILES([ libgtkform.pc libgtkformui.pc Makefile - src/Makefile - ui/Makefile - ui/test/Makefile + libgtkform/Makefile + libgtkformui/Makefile + libgtkformui/test/Makefile test/Makefile docs/Makefile docs/reference/Makefile @@ -98,13 +98,13 @@ AC_CONFIG_FILES([ if test $GLADEUI_FOUND = yes; then AC_CONFIG_FILES([ - ui/glade/Makefile - ui/glade/icons/Makefile - ui/glade/icons/hicolor/Makefile - ui/glade/icons/hicolor/16x16/Makefile - ui/glade/icons/hicolor/16x16/actions/Makefile - ui/glade/icons/hicolor/22x22/Makefile - ui/glade/icons/hicolor/22x22/actions/Makefile + libgtkformui/glade/Makefile + libgtkformui/glade/icons/Makefile + libgtkformui/glade/icons/hicolor/Makefile + libgtkformui/glade/icons/hicolor/16x16/Makefile + libgtkformui/glade/icons/hicolor/16x16/actions/Makefile + libgtkformui/glade/icons/hicolor/22x22/Makefile + libgtkformui/glade/icons/hicolor/22x22/actions/Makefile ]) fi diff --git a/src/Makefile.am b/libgtkform/Makefile.am similarity index 100% rename from src/Makefile.am rename to libgtkform/Makefile.am diff --git a/src/field.c b/libgtkform/field.c similarity index 100% rename from src/field.c rename to libgtkform/field.c diff --git a/src/field.h b/libgtkform/field.h similarity index 100% rename from src/field.h rename to libgtkform/field.h diff --git a/src/fieldboolean.c b/libgtkform/fieldboolean.c similarity index 100% rename from src/fieldboolean.c rename to libgtkform/fieldboolean.c diff --git a/src/fieldboolean.h b/libgtkform/fieldboolean.h similarity index 100% rename from src/fieldboolean.h rename to libgtkform/fieldboolean.h diff --git a/src/fielddatetime.c b/libgtkform/fielddatetime.c similarity index 100% rename from src/fielddatetime.c rename to libgtkform/fielddatetime.c diff --git a/src/fielddatetime.h b/libgtkform/fielddatetime.h similarity index 100% rename from src/fielddatetime.h rename to libgtkform/fielddatetime.h diff --git a/src/fieldfloat.c b/libgtkform/fieldfloat.c similarity index 100% rename from src/fieldfloat.c rename to libgtkform/fieldfloat.c diff --git a/src/fieldfloat.h b/libgtkform/fieldfloat.h similarity index 100% rename from src/fieldfloat.h rename to libgtkform/fieldfloat.h diff --git a/src/fieldinteger.c b/libgtkform/fieldinteger.c similarity index 100% rename from src/fieldinteger.c rename to libgtkform/fieldinteger.c diff --git a/src/fieldinteger.h b/libgtkform/fieldinteger.h similarity index 100% rename from src/fieldinteger.h rename to libgtkform/fieldinteger.h diff --git a/src/fieldtext.c b/libgtkform/fieldtext.c similarity index 100% rename from src/fieldtext.c rename to libgtkform/fieldtext.c diff --git a/src/fieldtext.h b/libgtkform/fieldtext.h similarity index 100% rename from src/fieldtext.h rename to libgtkform/fieldtext.h diff --git a/src/form.c b/libgtkform/form.c similarity index 100% rename from src/form.c rename to libgtkform/form.c diff --git a/src/form.h b/libgtkform/form.h similarity index 100% rename from src/form.h rename to libgtkform/form.h diff --git a/src/group.c b/libgtkform/group.c similarity index 100% rename from src/group.c rename to libgtkform/group.c diff --git a/src/group.h b/libgtkform/group.h similarity index 100% rename from src/group.h rename to libgtkform/group.h diff --git a/src/key.c b/libgtkform/key.c similarity index 100% rename from src/key.c rename to libgtkform/key.c diff --git a/src/key.h b/libgtkform/key.h similarity index 100% rename from src/key.h rename to libgtkform/key.h diff --git a/src/widget.c b/libgtkform/widget.c similarity index 100% rename from src/widget.c rename to libgtkform/widget.c diff --git a/src/widget.h b/libgtkform/widget.h similarity index 100% rename from src/widget.h rename to libgtkform/widget.h diff --git a/src/widgetcheck.c b/libgtkform/widgetcheck.c similarity index 100% rename from src/widgetcheck.c rename to libgtkform/widgetcheck.c diff --git a/src/widgetcheck.h b/libgtkform/widgetcheck.h similarity index 100% rename from src/widgetcheck.h rename to libgtkform/widgetcheck.h diff --git a/src/widgetcombobox.c b/libgtkform/widgetcombobox.c similarity index 100% rename from src/widgetcombobox.c rename to libgtkform/widgetcombobox.c diff --git a/src/widgetcombobox.h b/libgtkform/widgetcombobox.h similarity index 100% rename from src/widgetcombobox.h rename to libgtkform/widgetcombobox.h diff --git a/src/widgetentry.c b/libgtkform/widgetentry.c similarity index 100% rename from src/widgetentry.c rename to libgtkform/widgetentry.c diff --git a/src/widgetentry.h b/libgtkform/widgetentry.h similarity index 100% rename from src/widgetentry.h rename to libgtkform/widgetentry.h diff --git a/src/widgetlabel.c b/libgtkform/widgetlabel.c similarity index 100% rename from src/widgetlabel.c rename to libgtkform/widgetlabel.c diff --git a/src/widgetlabel.h b/libgtkform/widgetlabel.h similarity index 100% rename from src/widgetlabel.h rename to libgtkform/widgetlabel.h diff --git a/src/widgetradio.c b/libgtkform/widgetradio.c similarity index 100% rename from src/widgetradio.c rename to libgtkform/widgetradio.c diff --git a/src/widgetradio.h b/libgtkform/widgetradio.h similarity index 100% rename from src/widgetradio.h rename to libgtkform/widgetradio.h diff --git a/src/widgetspin.c b/libgtkform/widgetspin.c similarity index 100% rename from src/widgetspin.c rename to libgtkform/widgetspin.c diff --git a/src/widgetspin.h b/libgtkform/widgetspin.h similarity index 100% rename from src/widgetspin.h rename to libgtkform/widgetspin.h diff --git a/src/widgettextview.c b/libgtkform/widgettextview.c similarity index 100% rename from src/widgettextview.c rename to libgtkform/widgettextview.c diff --git a/src/widgettextview.h b/libgtkform/widgettextview.h similarity index 100% rename from src/widgettextview.h rename to libgtkform/widgettextview.h diff --git a/ui/Makefile.am b/libgtkformui/Makefile.am similarity index 91% rename from ui/Makefile.am rename to libgtkformui/Makefile.am index 5f127a8..1e3b1b5 100644 --- a/ui/Makefile.am +++ b/libgtkformui/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS = . \ AM_CPPFLAGS = $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(GTKFORM_CFLAGS) \ + -I$(top_srcdir) \ -DLOCALEDIR=\"$(localedir)\" \ -DMODULESDIR=\""$(libdir)/$(PACKAGE)/modules"\" \ -DG_LOG_DOMAIN=\"GtkFormUI\" @@ -30,7 +31,7 @@ lib_LTLIBRARIES = libgtkformui.la libgtkformui_la_SOURCES = gtkformdecoder.c \ gtkformwidgetdecoder.c -libgtkformui_la_LIBADD = $(top_builddir)/src/libgtkform.la +libgtkformui_la_LIBADD = $(top_builddir)/libgtkform/libgtkform.la libgtkformui_la_LDFLAGS = -no-undefined diff --git a/ui/glade/Makefile.am b/libgtkformui/glade/Makefile.am similarity index 100% rename from ui/glade/Makefile.am rename to libgtkformui/glade/Makefile.am diff --git a/ui/glade/gtkformui.xml b/libgtkformui/glade/gtkformui.xml similarity index 100% rename from ui/glade/gtkformui.xml rename to libgtkformui/glade/gtkformui.xml diff --git a/ui/glade/icons/Makefile.am b/libgtkformui/glade/icons/Makefile.am similarity index 100% rename from ui/glade/icons/Makefile.am rename to libgtkformui/glade/icons/Makefile.am diff --git a/ui/glade/icons/hicolor/16x16/Makefile.am b/libgtkformui/glade/icons/hicolor/16x16/Makefile.am similarity index 100% rename from ui/glade/icons/hicolor/16x16/Makefile.am rename to libgtkformui/glade/icons/hicolor/16x16/Makefile.am diff --git a/ui/glade/icons/hicolor/16x16/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am similarity index 100% rename from ui/glade/icons/hicolor/16x16/actions/Makefile.am rename to libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am diff --git a/ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png b/libgtkformui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png similarity index 100% rename from ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png rename to libgtkformui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png diff --git a/ui/glade/icons/hicolor/22x22/Makefile.am b/libgtkformui/glade/icons/hicolor/22x22/Makefile.am similarity index 100% rename from ui/glade/icons/hicolor/22x22/Makefile.am rename to libgtkformui/glade/icons/hicolor/22x22/Makefile.am diff --git a/ui/glade/icons/hicolor/22x22/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am similarity index 100% rename from ui/glade/icons/hicolor/22x22/actions/Makefile.am rename to libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am diff --git a/ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png b/libgtkformui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png similarity index 100% rename from ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png rename to libgtkformui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png diff --git a/ui/glade/icons/hicolor/Makefile.am b/libgtkformui/glade/icons/hicolor/Makefile.am similarity index 100% rename from ui/glade/icons/hicolor/Makefile.am rename to libgtkformui/glade/icons/hicolor/Makefile.am diff --git a/ui/gtkformdecoder.c b/libgtkformui/gtkformdecoder.c similarity index 100% rename from ui/gtkformdecoder.c rename to libgtkformui/gtkformdecoder.c diff --git a/ui/gtkformdecoder.h b/libgtkformui/gtkformdecoder.h similarity index 100% rename from ui/gtkformdecoder.h rename to libgtkformui/gtkformdecoder.h diff --git a/ui/gtkformwidgetdecoder.c b/libgtkformui/gtkformwidgetdecoder.c similarity index 100% rename from ui/gtkformwidgetdecoder.c rename to libgtkformui/gtkformwidgetdecoder.c diff --git a/ui/gtkformwidgetdecoder.h b/libgtkformui/gtkformwidgetdecoder.h similarity index 100% rename from ui/gtkformwidgetdecoder.h rename to libgtkformui/gtkformwidgetdecoder.h diff --git a/ui/test/Makefile.am b/libgtkformui/test/Makefile.am similarity index 57% rename from ui/test/Makefile.am rename to libgtkformui/test/Makefile.am index 7a0133c..40afd35 100644 --- a/ui/test/Makefile.am +++ b/libgtkformui/test/Makefile.am @@ -4,15 +4,14 @@ LIBS = $(GTKFORM_LIBS) \ AM_CPPFLAGS = $(GTKFORM_CFLAGS) \ $(GTKFORMUI_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/ui \ + -I$(top_srcdir) \ -DGUIDIR="\"@abs_builddir@\"" noinst_PROGRAMS = decoder -test_SOURCES = decoder.c +decoder_SOURCES = decoder.c -LDADD = $(top_builddir)/src/libgtkform.la \ - $(top_builddir)/ui/libgtkformui.la +LDADD = $(top_builddir)/libgtkform/libgtkform.la \ + $(top_builddir)/libgtkformui/libgtkformui.la EXTRA_DIST = database.db diff --git a/ui/test/database.db b/libgtkformui/test/database.db similarity index 100% rename from ui/test/database.db rename to libgtkformui/test/database.db diff --git a/ui/test/decoder.c b/libgtkformui/test/decoder.c similarity index 98% rename from ui/test/decoder.c rename to libgtkformui/test/decoder.c index f93f629..3d40b4b 100644 --- a/ui/test/decoder.c +++ b/libgtkformui/test/decoder.c @@ -20,7 +20,7 @@ #include -#include "gtkformdecoder.h" +#include GtkWidget *w; GtkWidget *decoder; diff --git a/test/Makefile.am b/test/Makefile.am index 944cfbe..c3ee566 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,7 @@ LIBS = $(GTKFORM_LIBS) \ -export-dynamic AM_CPPFLAGS = $(GTKFORM_CFLAGS) \ - -I$(top_srcdir)/src \ + -I$(top_srcdir) \ -DGUIDIR="\"@abs_builddir@\"" noinst_PROGRAMS = test \ @@ -11,7 +11,7 @@ noinst_PROGRAMS = test \ test_SOURCES = main.c -LDADD = $(top_builddir)/src/libgtkform.la +LDADD = $(top_builddir)/libgtkform/libgtkform.la EXTRA_DIST = database.db \ test.gui \ diff --git a/test/from_xml.c b/test/from_xml.c index 6e8efcb..edb72a6 100644 --- a/test/from_xml.c +++ b/test/from_xml.c @@ -20,20 +20,20 @@ #include -#include "form.h" -#include "field.h" -#include "fieldboolean.h" -#include "fielddatetime.h" -#include "fieldinteger.h" -#include "fieldfloat.h" -#include "fieldtext.h" -#include "widget.h" -#include "widgetcheck.h" -#include "widgetcombobox.h" -#include "widgetentry.h" -#include "widgetlabel.h" -#include "widgetspin.h" -#include "widgettextview.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include GtkForm *form; diff --git a/test/from_xml_with_db.c b/test/from_xml_with_db.c index 1b1729f..6715599 100644 --- a/test/from_xml_with_db.c +++ b/test/from_xml_with_db.c @@ -22,20 +22,20 @@ #include -#include "form.h" -#include "field.h" -#include "fieldboolean.h" -#include "fielddatetime.h" -#include "fieldinteger.h" -#include "fieldfloat.h" -#include "fieldtext.h" -#include "widget.h" -#include "widgetcheck.h" -#include "widgetcombobox.h" -#include "widgetentry.h" -#include "widgetlabel.h" -#include "widgetspin.h" -#include "widgettextview.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include GdaEx *gdaex; diff --git a/test/main.c b/test/main.c index 03e7597..d614182 100644 --- a/test/main.c +++ b/test/main.c @@ -21,20 +21,20 @@ #include -#include "form.h" -#include "field.h" -#include "fieldboolean.h" -#include "fielddatetime.h" -#include "fieldinteger.h" -#include "fieldfloat.h" -#include "fieldtext.h" -#include "widget.h" -#include "widgetcheck.h" -#include "widgetcombobox.h" -#include "widgetentry.h" -#include "widgetlabel.h" -#include "widgetspin.h" -#include "widgettextview.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include GtkForm *form; -- 2.49.0