From c9d55afdda746d7e8b39e5a117c1644debbb0c75 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 15 Dec 2008 15:06:07 +0900 Subject: [PATCH] Rename lib/gtksheet to lib/gtk-contrib --- lib/automake.mk | 2 +- lib/{gtksheet => gtk-contrib}/COPYING.LESSER | 0 lib/{gtksheet => gtk-contrib}/OChangeLog | 0 lib/{gtksheet => gtk-contrib}/README | 0 lib/gtk-contrib/automake.mk | 16 ++++++++++++++++ lib/{gtksheet => gtk-contrib}/gtkextra-sheet.h | 0 lib/{gtksheet => gtk-contrib}/gtkxpaned.c | 0 lib/{gtksheet => gtk-contrib}/gtkxpaned.h | 0 lib/{gtksheet => gtk-contrib}/psppire-sheet.c | 0 lib/{gtksheet => gtk-contrib}/psppire-sheet.h | 0 lib/gtksheet/automake.mk | 16 ---------------- src/ui/gui/automake.mk | 2 +- src/ui/gui/psppire-data-editor.c | 4 ++-- src/ui/gui/psppire-var-sheet.h | 2 +- src/ui/gui/sheet/psppire-sheetmodel.h | 2 +- src/ui/gui/text-data-import-dialog.c | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) rename lib/{gtksheet => gtk-contrib}/COPYING.LESSER (100%) rename lib/{gtksheet => gtk-contrib}/OChangeLog (100%) rename lib/{gtksheet => gtk-contrib}/README (100%) create mode 100644 lib/gtk-contrib/automake.mk rename lib/{gtksheet => gtk-contrib}/gtkextra-sheet.h (100%) rename lib/{gtksheet => gtk-contrib}/gtkxpaned.c (100%) rename lib/{gtksheet => gtk-contrib}/gtkxpaned.h (100%) rename lib/{gtksheet => gtk-contrib}/psppire-sheet.c (100%) rename lib/{gtksheet => gtk-contrib}/psppire-sheet.h (100%) delete mode 100644 lib/gtksheet/automake.mk diff --git a/lib/automake.mk b/lib/automake.mk index 9197da97..7cd9c9f4 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -4,7 +4,7 @@ include $(top_srcdir)/lib/linreg/automake.mk include $(top_srcdir)/lib/misc/automake.mk if WITHGUI -include $(top_srcdir)/lib/gtksheet/automake.mk +include $(top_srcdir)/lib/gtk-contrib/automake.mk endif EXTRA_DIST += lib/OChangeLog diff --git a/lib/gtksheet/COPYING.LESSER b/lib/gtk-contrib/COPYING.LESSER similarity index 100% rename from lib/gtksheet/COPYING.LESSER rename to lib/gtk-contrib/COPYING.LESSER diff --git a/lib/gtksheet/OChangeLog b/lib/gtk-contrib/OChangeLog similarity index 100% rename from lib/gtksheet/OChangeLog rename to lib/gtk-contrib/OChangeLog diff --git a/lib/gtksheet/README b/lib/gtk-contrib/README similarity index 100% rename from lib/gtksheet/README rename to lib/gtk-contrib/README diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk new file mode 100644 index 00000000..c78e61f1 --- /dev/null +++ b/lib/gtk-contrib/automake.mk @@ -0,0 +1,16 @@ +## Process this file with automake to produce Makefile.in -*- makefile -*- + +noinst_LIBRARIES += lib/gtk-contrib/libgtksheet.a + +lib_gtk_contrib_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 + +lib_gtk_contrib_libgtksheet_a_SOURCES = \ + lib/gtk-contrib/gtkextra-sheet.h \ + lib/gtk-contrib/psppire-sheet.c \ + lib/gtk-contrib/psppire-sheet.h \ + lib/gtk-contrib/gtkxpaned.c \ + lib/gtk-contrib/gtkxpaned.h + +EXTRA_DIST += lib/gtk-contrib/OChangeLog \ + lib/gtk-contrib/README + diff --git a/lib/gtksheet/gtkextra-sheet.h b/lib/gtk-contrib/gtkextra-sheet.h similarity index 100% rename from lib/gtksheet/gtkextra-sheet.h rename to lib/gtk-contrib/gtkextra-sheet.h diff --git a/lib/gtksheet/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c similarity index 100% rename from lib/gtksheet/gtkxpaned.c rename to lib/gtk-contrib/gtkxpaned.c diff --git a/lib/gtksheet/gtkxpaned.h b/lib/gtk-contrib/gtkxpaned.h similarity index 100% rename from lib/gtksheet/gtkxpaned.h rename to lib/gtk-contrib/gtkxpaned.h diff --git a/lib/gtksheet/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c similarity index 100% rename from lib/gtksheet/psppire-sheet.c rename to lib/gtk-contrib/psppire-sheet.c diff --git a/lib/gtksheet/psppire-sheet.h b/lib/gtk-contrib/psppire-sheet.h similarity index 100% rename from lib/gtksheet/psppire-sheet.h rename to lib/gtk-contrib/psppire-sheet.h diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk deleted file mode 100644 index d91b6db3..00000000 --- a/lib/gtksheet/automake.mk +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -*- makefile -*- - -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/gtkextra-sheet.h \ - lib/gtksheet/psppire-sheet.c \ - lib/gtksheet/psppire-sheet.h \ - lib/gtksheet/gtkxpaned.c \ - lib/gtksheet/gtkxpaned.h - -EXTRA_DIST += lib/gtksheet/OChangeLog \ - lib/gtksheet/README - diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index e3480d7a..57d9163c 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -54,7 +54,7 @@ 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 \ + lib/gtk-contrib/libgtksheet.a \ src/ui/libuicommon.la \ src/libpspp.la \ src/libpspp-core.la \ diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 6963a424..00e227ec 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "psppire-data-editor.h" #include "psppire-var-sheet.h" @@ -26,7 +26,7 @@ #include #include "helper.h" -#include +#include #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid diff --git a/src/ui/gui/psppire-var-sheet.h b/src/ui/gui/psppire-var-sheet.h index 79f911c8..b996275c 100644 --- a/src/ui/gui/psppire-var-sheet.h +++ b/src/ui/gui/psppire-var-sheet.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include "val-labs-dialog.h" #include "missing-val-dialog.h" #include "var-type-dialog.h" diff --git a/src/ui/gui/sheet/psppire-sheetmodel.h b/src/ui/gui/sheet/psppire-sheetmodel.h index 11f37e99..7869791e 100644 --- a/src/ui/gui/sheet/psppire-sheetmodel.h +++ b/src/ui/gui/sheet/psppire-sheetmodel.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index 92e3f893..a82a81a1 100644 --- a/src/ui/gui/text-data-import-dialog.c +++ b/src/ui/gui/text-data-import-dialog.c @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include -- 2.30.2