Move the actual library code of betawidget from lib/betawidget/ into lib/betawidget/src/

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6370 4a71c877-e1ca-e34f-864e-861f7616d084

lib/betawidget/Makefile.am

@@ -1,58 +1,3 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = platform . tools
-
-%_wrap_lua.cpp: %.i
-	$(SWIG) $(SWIG_LUA_OPT) -o $@ $<
-
-BUILT_SOURCES = \
-	betawidget_wrap_lua.cpp
-CLEANFILES = \
-	betawidget_wrap_lua.cpp
-
-lib_LTLIBRARIES = libbetawidget.la
-
-libbetawidget_la_SOURCES = \
-	betawidget_wrap_lua.cpp \
-	font.c \
-	geom.c \
-	hBox.c \
-	spacer.c \
-	textEntry.c \
-	vector.c \
-	widget.c \
-	window.c
-
-libbetawidget_la_CPPFLAGS = $(CAIRO_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
-libbetawidget_la_LDFLAGS = $(CAIRO_LIBS) $(OPENGL_LIBS)
-libbetawidget_la_LIBADD = $(LUA_LIBTOOL) platform/libplatform.la libutil.la
-
-# FIXME: As much non-API headers (i.e. headers that shouldn't be directly
-#        included by client code of betawidget) as possible should be moved to
-#        noinst_HEADERS.
-pkginclude_HEADERS = \
-	clipboard.h \
-	font.h \
-	internal-cairo.h \
-	keycode.h \
-	geom.h \
-	hBox.h \
-	spacer.h \
-	textEntry.h \
-	vector.h \
-	widget.h \
-	window.h
-
-noinst_HEADERS = 
-
-# utf.c, GLee
-noinst_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = \
-	../framework/utf.c \
-	../ivis_opengl/GLee.c
-
-libutil_la_CPPFLAGS = $(SDL_CFLAGS) -DLIB_COMPILE=1
-noinst_HEADERS += \
-	../framework/types.h \
-	../framework/utf.h \
-	../ivis_opengl/GLee.h
+SUBDIRS = src tools

lib/betawidget/autogen.sh

@@ -4,7 +4,7 @@
 DIE=0
 SRCDIR=`dirname $0`
 BUILDDIR=`pwd`
-srcfile=vector.c
+srcfile=src/vector.c
 package=Betawidget
 
 debug ()

lib/betawidget/configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT(betawidget, VERSION)
-AC_CONFIG_SRCDIR([vector.h])
+AC_CONFIG_SRCDIR([src/vector.h])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
 
@@ -98,7 +98,8 @@ CFLAGS="${CFLAGS} -Werror-implicit-function-declaration"
 AC_SUBST([CFLAGS])
 
 AC_CONFIG_FILES([Makefile
-                 platform/Makefile
-                 platform/sdl/Makefile
+                 src/Makefile
+                 src/platform/Makefile
+                 src/platform/sdl/Makefile
                  tools/Makefile])
 AC_OUTPUT

lib/betawidget/src/Makefile.am

@@ -0,0 +1,56 @@
+SUBDIRS = platform
+
+%_wrap_lua.cpp: %.i
+	$(SWIG) $(SWIG_LUA_OPT) -o $@ $<
+
+BUILT_SOURCES = \
+	betawidget_wrap_lua.cpp
+CLEANFILES = \
+	betawidget_wrap_lua.cpp
+
+lib_LTLIBRARIES = libbetawidget.la
+
+libbetawidget_la_SOURCES = \
+	betawidget_wrap_lua.cpp \
+	font.c \
+	geom.c \
+	hBox.c \
+	spacer.c \
+	textEntry.c \
+	vector.c \
+	widget.c \
+	window.c
+
+libbetawidget_la_CPPFLAGS = $(CAIRO_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
+libbetawidget_la_LDFLAGS = $(CAIRO_LIBS) $(OPENGL_LIBS)
+libbetawidget_la_LIBADD = $(LUA_LIBTOOL) platform/libplatform.la libutil.la
+
+# FIXME: As much non-API headers (i.e. headers that shouldn't be directly
+#        included by client code of betawidget) as possible should be moved to
+#        noinst_HEADERS.
+pkginclude_HEADERS = \
+	clipboard.h \
+	font.h \
+	internal-cairo.h \
+	keycode.h \
+	geom.h \
+	hBox.h \
+	spacer.h \
+	textEntry.h \
+	vector.h \
+	widget.h \
+	window.h
+
+noinst_HEADERS = 
+
+# utf.c, GLee
+noinst_LTLIBRARIES = libutil.la
+libutil_la_SOURCES = \
+	../../framework/utf.c \
+	../../ivis_opengl/GLee.c
+
+libutil_la_CPPFLAGS = $(SDL_CFLAGS) -DLIB_COMPILE=1
+noinst_HEADERS += \
+	../../framework/types.h \
+	../../framework/utf.h \
+	../../ivis_opengl/GLee.h

lib/betawidget/src/platform/sdl/event.c

@@ -23,7 +23,7 @@
 #include "../../widget.h"
 #include "../../window.h"
 
-#include "../../../framework/utf.h"
+#include "../../../../framework/utf.h"
 
 /**
  * Converts an SDLkey to an eventKeycode (as used by the widget system).

lib/betawidget/tools/Makefile.am

@@ -3,5 +3,5 @@ noinst_PROGRAMS = sdl-testapp
 sdl_testapp_SOURCES = \
 	sdl-testapp.c
 
-sdl_testapp_CPPFLAGS = -I$(top_srcdir)/.. $(LUA_CFLAGS) $(SDL_CFLAGS)
-sdl_testapp_LDADD = $(OPENGL_LIBS) $(SDL_LIBS) $(top_builddir)/libbetawidget.la $(LUA_LIBTOOL)
+sdl_testapp_CPPFLAGS = $(LUA_CFLAGS) $(SDL_CFLAGS)
+sdl_testapp_LDADD = $(OPENGL_LIBS) $(SDL_LIBS) $(top_builddir)/src/libbetawidget.la $(LUA_LIBTOOL)

lib/betawidget/tools/sdl-testapp.c

@@ -26,14 +26,14 @@
 #include <SDL.h>
 #include <SDL_main.h>
 
-#include <betawidget/widget.h>
-#include <betawidget/hBox.h>
-#include <betawidget/spacer.h>
-#include <betawidget/textEntry.h>
-#include <betawidget/window.h>
-#include <betawidget/platform/sdl/event.h>
-#include <betawidget/platform/sdl/init.h>
-#include <betawidget/lua-wrap.h>
+#include "../src/widget.h"
+#include "../src/hBox.h"
+#include "../src/spacer.h"
+#include "../src/textEntry.h"
+#include "../src/window.h"
+#include "../src/platform/sdl/event.h"
+#include "../src/platform/sdl/init.h"
+#include "../src/lua-wrap.h"
 #include <lualib.h>
 #include <lauxlib.h>