From ffce2432a76f3ffbe2a19228d3b3d03613c3b4a3 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 15 Dec 2008 14:30:41 +0900 Subject: [PATCH] Created new directory src/ui/gui/sheet Moved files from lib/gtksheet to src/ui/gui/sheet except those whose copyright is not FSF owned. --- lib/gtksheet/automake.mk | 9 +-------- lib/gtksheet/psppire-sheet.c | 2 +- lib/gtksheet/psppire-sheet.h | 4 ++-- src/ui/gui/automake.mk | 3 +++ src/ui/gui/psppire-data-editor.c | 2 +- src/ui/gui/psppire-data-editor.h | 2 +- src/ui/gui/psppire-data-store.c | 2 +- src/ui/gui/psppire-var-sheet.c | 2 +- src/ui/gui/psppire-var-store.c | 2 +- src/ui/gui/sheet/automake.mk | 14 ++++++++++++++ .../ui/gui/sheet}/psppire-axis-impl.c | 0 .../ui/gui/sheet}/psppire-axis-impl.h | 0 {lib/gtksheet => src/ui/gui/sheet}/psppire-axis.c | 0 {lib/gtksheet => src/ui/gui/sheet}/psppire-axis.h | 0 .../ui/gui/sheet}/psppire-sheetmodel.c | 0 .../ui/gui/sheet}/psppire-sheetmodel.h | 2 +- 16 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 src/ui/gui/sheet/automake.mk rename {lib/gtksheet => src/ui/gui/sheet}/psppire-axis-impl.c (100%) rename {lib/gtksheet => src/ui/gui/sheet}/psppire-axis-impl.h (100%) rename {lib/gtksheet => src/ui/gui/sheet}/psppire-axis.c (100%) rename {lib/gtksheet => src/ui/gui/sheet}/psppire-axis.h (100%) rename {lib/gtksheet => src/ui/gui/sheet}/psppire-sheetmodel.c (100%) rename {lib/gtksheet => src/ui/gui/sheet}/psppire-sheetmodel.h (99%) diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk index a96c25d8be..d91b6db320 100644 --- a/lib/gtksheet/automake.mk +++ b/lib/gtksheet/automake.mk @@ -5,18 +5,11 @@ noinst_LIBRARIES += lib/gtksheet/libgtksheet.a lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 lib_gtksheet_libgtksheet_a_SOURCES = \ - lib/gtksheet/psppire-sheetmodel.c \ - lib/gtksheet/psppire-sheetmodel.h \ lib/gtksheet/gtkextra-sheet.h \ lib/gtksheet/psppire-sheet.c \ lib/gtksheet/psppire-sheet.h \ lib/gtksheet/gtkxpaned.c \ - lib/gtksheet/gtkxpaned.h \ - lib/gtksheet/psppire-axis.c \ - lib/gtksheet/psppire-axis.h \ - lib/gtksheet/psppire-axis-impl.c \ - lib/gtksheet/psppire-axis-impl.h - + lib/gtksheet/gtkxpaned.h EXTRA_DIST += lib/gtksheet/OChangeLog \ lib/gtksheet/README diff --git a/lib/gtksheet/psppire-sheet.c b/lib/gtksheet/psppire-sheet.c index 2464b970ac..dac561a134 100644 --- a/lib/gtksheet/psppire-sheet.c +++ b/lib/gtksheet/psppire-sheet.c @@ -68,7 +68,7 @@ #include #include "psppire-sheet.h" #include -#include "psppire-sheetmodel.h" +#include #include #include diff --git a/lib/gtksheet/psppire-sheet.h b/lib/gtksheet/psppire-sheet.h index 8a5e07905b..82de87bed5 100644 --- a/lib/gtksheet/psppire-sheet.h +++ b/lib/gtksheet/psppire-sheet.h @@ -48,8 +48,8 @@ #include #include "gtkextra-sheet.h" -#include "psppire-sheetmodel.h" -#include "psppire-axis.h" +#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index f53c540ed4..e3480d7a43 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- +include $(top_srcdir)/src/ui/gui/sheet/automake.mk + bin_PROGRAMS += src/ui/gui/psppire src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \ @@ -51,6 +53,7 @@ src_ui_gui_libpsppire_la_SOURCES = \ src_ui_gui_psppire_LDADD = \ -dlopen src/ui/gui/libpsppire.la \ src/ui/gui/libpsppwidgets.la \ + src/ui/gui/sheet/libsheet.la \ lib/gtksheet/libgtksheet.a \ src/ui/libuicommon.la \ src/libpspp.la \ diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index ef2c8826f5..6963a42448 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -23,7 +23,7 @@ #include #include "psppire-data-store.h" -#include +#include #include "helper.h" #include diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h index 9b81c223fd..ee95a03c46 100644 --- a/src/ui/gui/psppire-data-editor.h +++ b/src/ui/gui/psppire-data-editor.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "psppire-var-store.h" #include "psppire-data-store.h" diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index da68ba8825..37747e07c7 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c index 429f258cc4..d914866658 100644 --- a/src/ui/gui/psppire-var-sheet.c +++ b/src/ui/gui/psppire-var-sheet.c @@ -16,7 +16,7 @@ #include #include "psppire-var-sheet.h" -#include +#include #include #include "helper.h" diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index 2b6364a742..cdb32719ed 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -25,7 +25,7 @@ #include -#include +#include #include "psppire-var-store.h" #include "helper.h" diff --git a/src/ui/gui/sheet/automake.mk b/src/ui/gui/sheet/automake.mk new file mode 100644 index 0000000000..640f02e09a --- /dev/null +++ b/src/ui/gui/sheet/automake.mk @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in -*- makefile -*- + +noinst_LTLIBRARIES += src/ui/gui/sheet/libsheet.la + +src_ui_gui_sheet_libsheet_la_CFLAGS = $(GTK_CFLAGS) + +src_ui_gui_sheet_libsheet_la_SOURCES = \ + src/ui/gui/sheet/psppire-axis.c \ + src/ui/gui/sheet/psppire-axis.h \ + src/ui/gui/sheet/psppire-axis-impl.c \ + src/ui/gui/sheet/psppire-axis-impl.h \ + src/ui/gui/sheet/psppire-sheetmodel.c \ + src/ui/gui/sheet/psppire-sheetmodel.h + diff --git a/lib/gtksheet/psppire-axis-impl.c b/src/ui/gui/sheet/psppire-axis-impl.c similarity index 100% rename from lib/gtksheet/psppire-axis-impl.c rename to src/ui/gui/sheet/psppire-axis-impl.c diff --git a/lib/gtksheet/psppire-axis-impl.h b/src/ui/gui/sheet/psppire-axis-impl.h similarity index 100% rename from lib/gtksheet/psppire-axis-impl.h rename to src/ui/gui/sheet/psppire-axis-impl.h diff --git a/lib/gtksheet/psppire-axis.c b/src/ui/gui/sheet/psppire-axis.c similarity index 100% rename from lib/gtksheet/psppire-axis.c rename to src/ui/gui/sheet/psppire-axis.c diff --git a/lib/gtksheet/psppire-axis.h b/src/ui/gui/sheet/psppire-axis.h similarity index 100% rename from lib/gtksheet/psppire-axis.h rename to src/ui/gui/sheet/psppire-axis.h diff --git a/lib/gtksheet/psppire-sheetmodel.c b/src/ui/gui/sheet/psppire-sheetmodel.c similarity index 100% rename from lib/gtksheet/psppire-sheetmodel.c rename to src/ui/gui/sheet/psppire-sheetmodel.c diff --git a/lib/gtksheet/psppire-sheetmodel.h b/src/ui/gui/sheet/psppire-sheetmodel.h similarity index 99% rename from lib/gtksheet/psppire-sheetmodel.h rename to src/ui/gui/sheet/psppire-sheetmodel.h index 236cacb7c4..11f37e99d0 100644 --- a/lib/gtksheet/psppire-sheetmodel.h +++ b/src/ui/gui/sheet/psppire-sheetmodel.h @@ -24,7 +24,7 @@ #include #include #include -#include "gtkextra-sheet.h" +#include G_BEGIN_DECLS -- 2.30.2