GNOME.org
 

[glide] Begin split of glide in to library/client.

commit fd3fd38ce201109653842fd834f1982bee05138d
Author: Robert Carr <racarr Valentine localdomain>
Date:   Tue May 4 02:41:54 2010 -0400

    Begin split of glide in to library/client.

 Makefile.am                                        |    5 +-
 compile                                            |    1 +
 configure.ac                                       |    5 +-
 glide.pc.in                                        |   13 +++
 libglide/Makefile.am                               |  111 ++++++++++++++++++++
 {src => libglide}/glide-actor-priv.h               |    0
 {src => libglide}/glide-actor.c                    |    0
 {src => libglide}/glide-actor.h                    |    0
 {src => libglide}/glide-animation-manager.c        |    0
 {src => libglide}/glide-animation-manager.h        |    0
 {src => libglide}/glide-animations.c               |    0
 {src => libglide}/glide-animations.h               |    0
 {src => libglide}/glide-cairo-util.c               |    0
 {src => libglide}/glide-cairo-util.h               |    0
 {src => libglide}/glide-debug.h                    |    0
 {src => libglide}/glide-dirs.c                     |    0
 {src => libglide}/glide-dirs.h                     |    0
 {src => libglide}/glide-document-priv.h            |    0
 {src => libglide}/glide-document.c                 |    0
 {src => libglide}/glide-document.h                 |    0
 {src => libglide}/glide-gtk-util.c                 |    0
 {src => libglide}/glide-gtk-util.h                 |    0
 {src => libglide}/glide-image-priv.h               |    0
 {src => libglide}/glide-image.c                    |    0
 {src => libglide}/glide-image.h                    |    0
 {src => libglide}/glide-inspector-actor-priv.h     |    0
 {src => libglide}/glide-inspector-actor.c          |    0
 {src => libglide}/glide-inspector-actor.h          |    0
 {src => libglide}/glide-inspector-animation-priv.h |    0
 {src => libglide}/glide-inspector-animation.c      |    0
 {src => libglide}/glide-inspector-animation.h      |    0
 {src => libglide}/glide-inspector-image-priv.h     |    0
 {src => libglide}/glide-inspector-image.c          |    0
 {src => libglide}/glide-inspector-image.h          |    0
 {src => libglide}/glide-inspector-notebook-priv.h  |    0
 {src => libglide}/glide-inspector-notebook.c       |    0
 {src => libglide}/glide-inspector-notebook.h       |    0
 {src => libglide}/glide-inspector-slide-priv.h     |    0
 {src => libglide}/glide-inspector-slide.c          |    0
 {src => libglide}/glide-inspector-slide.h          |    0
 {src => libglide}/glide-inspector-text-priv.h      |    0
 {src => libglide}/glide-inspector-text.c           |    0
 {src => libglide}/glide-inspector-text.h           |    0
 {src => libglide}/glide-json-util.c                |    0
 {src => libglide}/glide-json-util.h                |    0
 {src => libglide}/glide-manipulator-priv.h         |    0
 {src => libglide}/glide-manipulator.c              |    0
 {src => libglide}/glide-manipulator.h              |    0
 {src => libglide}/glide-pdf-exporter.c             |    0
 {src => libglide}/glide-pdf-exporter.h             |    0
 {src => libglide}/glide-rectangle.c                |    0
 {src => libglide}/glide-rectangle.h                |    0
 {src => libglide}/glide-slide-box-priv.h           |    0
 {src => libglide}/glide-slide-box.c                |    0
 {src => libglide}/glide-slide-box.h                |    0
 {src => libglide}/glide-slide-button-priv.h        |    0
 {src => libglide}/glide-slide-button.c             |    0
 {src => libglide}/glide-slide-button.h             |    0
 {src => libglide}/glide-slide-priv.h               |    0
 {src => libglide}/glide-slide.c                    |    0
 {src => libglide}/glide-slide.h                    |    0
 {src => libglide}/glide-stage-manager-priv.h       |    0
 {src => libglide}/glide-stage-manager.c            |    0
 {src => libglide}/glide-stage-manager.h            |    0
 {src => libglide}/glide-text.c                     |    0
 {src => libglide}/glide-text.h                     |    0
 {src => libglide}/glide-types.h                    |    0
 {src => libglide}/glide-undo-manager-priv.h        |    0
 {src => libglide}/glide-undo-manager.c             |    0
 {src => libglide}/glide-undo-manager.h             |    0
 {src => libglide}/glide-vala-animations.vala       |    0
 {src => libglide}/glide-window-private.h           |    0
 {src => libglide}/glide-window.c                   |    0
 {src => libglide}/glide-window.h                   |    0
 {src => libglide}/glide.vapi                       |    0
 src/Makefile.am                                    |  104 +-----------------
 src/main.c                                         |    6 +-
 77 files changed, 142 insertions(+), 103 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f00857d..b86bca7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Created by Anjuta
 
-SUBDIRS = src po data
+SUBDIRS = libglide po data src
 
 glidedocdir = ${prefix}/doc/glide
 glidedoc_DATA = \
@@ -12,6 +12,9 @@ glidedoc_DATA = \
 	INSTALL\
 	NEWS
 
+pkgconfig_DATA = glide.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
 
 INTLTOOL_FILES = intltool-extract.in \
 	intltool-merge.in \
diff --git a/compile b/compile
new file mode 120000
index 0000000..cf0edba
--- /dev/null
+++ b/compile
@@ -0,0 +1 @@
+/usr/share/automake-1.11/compile
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 3f5e4c8..2eef806 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ AM_MAINTAINER_MODE()
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_HEADER_STDC
 
 
@@ -101,6 +102,7 @@ AC_SUBST(GLIDE_DEBUG_CFLAGS)
 
 AC_CONFIG_FILES([
 Makefile
+glide.pc
 data/glide.desktop.in
 data/Makefile
 data/icons/Makefile
@@ -108,8 +110,9 @@ data/icons/hicolor/Makefile
 data/icons/hicolor/scalable/Makefile
 data/icons/hicolor/scalable/apps/Makefile
 data/ui/Makefile
-src/Makefile
+libglide/Makefile
 po/Makefile.in
+src/Makefile
 ])
 
 AC_OUTPUT
diff --git a/glide.pc.in b/glide.pc.in
new file mode 100644
index 0000000..872e554
--- /dev/null
+++ b/glide.pc.in
@@ -0,0 +1,13 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+bindir= bindir@
+includedir= includedir@
+
+Cflags: -I${includedir}/glide
+Requires: gtk+-2.0 clutter-1.0
+Libs: -L${libdir} -lglide
+
+Name: Glide
+Description: Glide presentations
+Version: @VERSION@
diff --git a/libglide/Makefile.am b/libglide/Makefile.am
new file mode 100644
index 0000000..9173947
--- /dev/null
+++ b/libglide/Makefile.am
@@ -0,0 +1,111 @@
+## Process this file with automake to produce Makefile.in
+
+## Created by Anjuta
+
+BUILT_SOURCES =
+
+AM_CFLAGS =\
+	 -g \
+	 -Wall 
+
+glide_VALASOURCES = \
+	glide-vala-animations.vala
+
+glide_VALABUILTSOURCES = $(glide_VALASOURCES:.vala=.c) 
+glide_VALABUILTSOURCES += glide-vala-animations.h
+glide_VALABUILTHEADERS = glide-vala-animations.h
+
+if MAINTAINER_MODE
+BUILT_SOURCES += vala.stamp	
+vala.stamp: $(glide_VALASOURCES) glide.vapi
+	$(VALAC) --pkg clutter-1.0 -C -H glide-vala-animations.h $^ 
+	touch $@
+endif
+
+lib_LTLIBRARIES = libglide.la
+
+glideheaders_HEADERS = \
+	glide-inspector-text.h \
+	glide-inspector-image.h \
+	glide-inspector-slide.h \
+	glide-inspector-actor.h \
+	glide-inspector-animation.h \
+	glide-inspector-notebook.h \
+	glide-slide-box.h \
+	glide-slide-button.h \
+	glide-animation-manager.h \
+	glide-cairo-util.h \
+	glide-pdf-exporter.h \
+	glide-undo-manager.h \
+	glide-animations.h \
+	glide-gtk-util.h \
+	glide-json-util.h \
+	glide-slide.h \
+	glide-types.h \
+	glide-document.h \
+	glide-dirs.h \
+	glide-text.h \
+	glide-image.h \
+	glide-stage-manager.h \
+	glide-rectangle.h \
+	glide-actor.h \
+	glide-manipulator.h \
+	glide-window.h \
+	$(glide_VALABUILTHEADERS)
+
+glideheadersdir = $(pkgincludedir)
+
+libglide_la_SOURCES = \
+	glide-window.c \
+	glide-manipulator.c \
+	glide-actor.c \
+	glide-rectangle.c \
+	glide-stage-manager.c \
+	glide-image.c \
+	glide-text.c \
+	glide-dirs.c \
+	glide-document.c \
+	glide-slide.c \
+	glide-json-util.c \
+	glide-gtk-util.c \
+	glide-animations.c \
+	glide-undo-manager.c \
+	glide-pdf-exporter.c \
+	glide-cairo-util.c \
+	glide-animation-manager.c \
+	glide-slide-button.c \
+	glide-slide-box.c \
+	glide-inspector-notebook.c \
+	glide-inspector-animation.c \
+	glide-inspector-actor.c \
+	glide-inspector-slide.c \
+	glide-inspector-image.c \
+	glide-inspector-text.c \
+	$(glide_VALABUILTSOURCES)
+
+libglide_la_CFLAGS = \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	$(GTK_CFLAGS) \
+	$(JSON_GLIB_CFLAGS) \
+	$(CLUTTER_CFLAGS) \
+	$(CLUTTER_GTK_CFLAGS) \
+	$(GLIDE_DEBUG_CFLAGS) \
+	$(GOBJECT_INTROSPECTION_CFLAGS)
+
+libglide_la_LDFLAGS = $(GTK_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(GOBJECT_INTROSPECTION_LIBS) $(JSON_GLIB_LIBS) $(GMODULE_LIBS) -Wl --export-dynamic
+
+EXTRA_DIST = $(ui_DATA) \
+	     $(glide_VALASOURCES)
+
+if MAINTAINER_MODE
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	$(glide_VALABUILTSOURCES)
+endif
+
+# Remove ui directory on uninstall
+uninstall-local:
+	-rm -r $(uidir)
+	-rm -r $(datadir)/glide
diff --git a/src/glide-actor-priv.h b/libglide/glide-actor-priv.h
similarity index 100%
rename from src/glide-actor-priv.h
rename to libglide/glide-actor-priv.h
diff --git a/src/glide-actor.c b/libglide/glide-actor.c
similarity index 100%
rename from src/glide-actor.c
rename to libglide/glide-actor.c
diff --git a/src/glide-actor.h b/libglide/glide-actor.h
similarity index 100%
rename from src/glide-actor.h
rename to libglide/glide-actor.h
diff --git a/src/glide-animation-manager.c b/libglide/glide-animation-manager.c
similarity index 100%
rename from src/glide-animation-manager.c
rename to libglide/glide-animation-manager.c
diff --git a/src/glide-animation-manager.h b/libglide/glide-animation-manager.h
similarity index 100%
rename from src/glide-animation-manager.h
rename to libglide/glide-animation-manager.h
diff --git a/src/glide-animations.c b/libglide/glide-animations.c
similarity index 100%
rename from src/glide-animations.c
rename to libglide/glide-animations.c
diff --git a/src/glide-animations.h b/libglide/glide-animations.h
similarity index 100%
rename from src/glide-animations.h
rename to libglide/glide-animations.h
diff --git a/src/glide-cairo-util.c b/libglide/glide-cairo-util.c
similarity index 100%
rename from src/glide-cairo-util.c
rename to libglide/glide-cairo-util.c
diff --git a/src/glide-cairo-util.h b/libglide/glide-cairo-util.h
similarity index 100%
rename from src/glide-cairo-util.h
rename to libglide/glide-cairo-util.h
diff --git a/src/glide-debug.h b/libglide/glide-debug.h
similarity index 100%
rename from src/glide-debug.h
rename to libglide/glide-debug.h
diff --git a/src/glide-dirs.c b/libglide/glide-dirs.c
similarity index 100%
rename from src/glide-dirs.c
rename to libglide/glide-dirs.c
diff --git a/src/glide-dirs.h b/libglide/glide-dirs.h
similarity index 100%
rename from src/glide-dirs.h
rename to libglide/glide-dirs.h
diff --git a/src/glide-document-priv.h b/libglide/glide-document-priv.h
similarity index 100%
rename from src/glide-document-priv.h
rename to libglide/glide-document-priv.h
diff --git a/src/glide-document.c b/libglide/glide-document.c
similarity index 100%
rename from src/glide-document.c
rename to libglide/glide-document.c
diff --git a/src/glide-document.h b/libglide/glide-document.h
similarity index 100%
rename from src/glide-document.h
rename to libglide/glide-document.h
diff --git a/src/glide-gtk-util.c b/libglide/glide-gtk-util.c
similarity index 100%
rename from src/glide-gtk-util.c
rename to libglide/glide-gtk-util.c
diff --git a/src/glide-gtk-util.h b/libglide/glide-gtk-util.h
similarity index 100%
rename from src/glide-gtk-util.h
rename to libglide/glide-gtk-util.h
diff --git a/src/glide-image-priv.h b/libglide/glide-image-priv.h
similarity index 100%
rename from src/glide-image-priv.h
rename to libglide/glide-image-priv.h
diff --git a/src/glide-image.c b/libglide/glide-image.c
similarity index 100%
rename from src/glide-image.c
rename to libglide/glide-image.c
diff --git a/src/glide-image.h b/libglide/glide-image.h
similarity index 100%
rename from src/glide-image.h
rename to libglide/glide-image.h
diff --git a/src/glide-inspector-actor-priv.h b/libglide/glide-inspector-actor-priv.h
similarity index 100%
rename from src/glide-inspector-actor-priv.h
rename to libglide/glide-inspector-actor-priv.h
diff --git a/src/glide-inspector-actor.c b/libglide/glide-inspector-actor.c
similarity index 100%
rename from src/glide-inspector-actor.c
rename to libglide/glide-inspector-actor.c
diff --git a/src/glide-inspector-actor.h b/libglide/glide-inspector-actor.h
similarity index 100%
rename from src/glide-inspector-actor.h
rename to libglide/glide-inspector-actor.h
diff --git a/src/glide-inspector-animation-priv.h b/libglide/glide-inspector-animation-priv.h
similarity index 100%
rename from src/glide-inspector-animation-priv.h
rename to libglide/glide-inspector-animation-priv.h
diff --git a/src/glide-inspector-animation.c b/libglide/glide-inspector-animation.c
similarity index 100%
rename from src/glide-inspector-animation.c
rename to libglide/glide-inspector-animation.c
diff --git a/src/glide-inspector-animation.h b/libglide/glide-inspector-animation.h
similarity index 100%
rename from src/glide-inspector-animation.h
rename to libglide/glide-inspector-animation.h
diff --git a/src/glide-inspector-image-priv.h b/libglide/glide-inspector-image-priv.h
similarity index 100%
rename from src/glide-inspector-image-priv.h
rename to libglide/glide-inspector-image-priv.h
diff --git a/src/glide-inspector-image.c b/libglide/glide-inspector-image.c
similarity index 100%
rename from src/glide-inspector-image.c
rename to libglide/glide-inspector-image.c
diff --git a/src/glide-inspector-image.h b/libglide/glide-inspector-image.h
similarity index 100%
rename from src/glide-inspector-image.h
rename to libglide/glide-inspector-image.h
diff --git a/src/glide-inspector-notebook-priv.h b/libglide/glide-inspector-notebook-priv.h
similarity index 100%
rename from src/glide-inspector-notebook-priv.h
rename to libglide/glide-inspector-notebook-priv.h
diff --git a/src/glide-inspector-notebook.c b/libglide/glide-inspector-notebook.c
similarity index 100%
rename from src/glide-inspector-notebook.c
rename to libglide/glide-inspector-notebook.c
diff --git a/src/glide-inspector-notebook.h b/libglide/glide-inspector-notebook.h
similarity index 100%
rename from src/glide-inspector-notebook.h
rename to libglide/glide-inspector-notebook.h
diff --git a/src/glide-inspector-slide-priv.h b/libglide/glide-inspector-slide-priv.h
similarity index 100%
rename from src/glide-inspector-slide-priv.h
rename to libglide/glide-inspector-slide-priv.h
diff --git a/src/glide-inspector-slide.c b/libglide/glide-inspector-slide.c
similarity index 100%
rename from src/glide-inspector-slide.c
rename to libglide/glide-inspector-slide.c
diff --git a/src/glide-inspector-slide.h b/libglide/glide-inspector-slide.h
similarity index 100%
rename from src/glide-inspector-slide.h
rename to libglide/glide-inspector-slide.h
diff --git a/src/glide-inspector-text-priv.h b/libglide/glide-inspector-text-priv.h
similarity index 100%
rename from src/glide-inspector-text-priv.h
rename to libglide/glide-inspector-text-priv.h
diff --git a/src/glide-inspector-text.c b/libglide/glide-inspector-text.c
similarity index 100%
rename from src/glide-inspector-text.c
rename to libglide/glide-inspector-text.c
diff --git a/src/glide-inspector-text.h b/libglide/glide-inspector-text.h
similarity index 100%
rename from src/glide-inspector-text.h
rename to libglide/glide-inspector-text.h
diff --git a/src/glide-json-util.c b/libglide/glide-json-util.c
similarity index 100%
rename from src/glide-json-util.c
rename to libglide/glide-json-util.c
diff --git a/src/glide-json-util.h b/libglide/glide-json-util.h
similarity index 100%
rename from src/glide-json-util.h
rename to libglide/glide-json-util.h
diff --git a/src/glide-manipulator-priv.h b/libglide/glide-manipulator-priv.h
similarity index 100%
rename from src/glide-manipulator-priv.h
rename to libglide/glide-manipulator-priv.h
diff --git a/src/glide-manipulator.c b/libglide/glide-manipulator.c
similarity index 100%
rename from src/glide-manipulator.c
rename to libglide/glide-manipulator.c
diff --git a/src/glide-manipulator.h b/libglide/glide-manipulator.h
similarity index 100%
rename from src/glide-manipulator.h
rename to libglide/glide-manipulator.h
diff --git a/src/glide-pdf-exporter.c b/libglide/glide-pdf-exporter.c
similarity index 100%
rename from src/glide-pdf-exporter.c
rename to libglide/glide-pdf-exporter.c
diff --git a/src/glide-pdf-exporter.h b/libglide/glide-pdf-exporter.h
similarity index 100%
rename from src/glide-pdf-exporter.h
rename to libglide/glide-pdf-exporter.h
diff --git a/src/glide-rectangle.c b/libglide/glide-rectangle.c
similarity index 100%
rename from src/glide-rectangle.c
rename to libglide/glide-rectangle.c
diff --git a/src/glide-rectangle.h b/libglide/glide-rectangle.h
similarity index 100%
rename from src/glide-rectangle.h
rename to libglide/glide-rectangle.h
diff --git a/src/glide-slide-box-priv.h b/libglide/glide-slide-box-priv.h
similarity index 100%
rename from src/glide-slide-box-priv.h
rename to libglide/glide-slide-box-priv.h
diff --git a/src/glide-slide-box.c b/libglide/glide-slide-box.c
similarity index 100%
rename from src/glide-slide-box.c
rename to libglide/glide-slide-box.c
diff --git a/src/glide-slide-box.h b/libglide/glide-slide-box.h
similarity index 100%
rename from src/glide-slide-box.h
rename to libglide/glide-slide-box.h
diff --git a/src/glide-slide-button-priv.h b/libglide/glide-slide-button-priv.h
similarity index 100%
rename from src/glide-slide-button-priv.h
rename to libglide/glide-slide-button-priv.h
diff --git a/src/glide-slide-button.c b/libglide/glide-slide-button.c
similarity index 100%
rename from src/glide-slide-button.c
rename to libglide/glide-slide-button.c
diff --git a/src/glide-slide-button.h b/libglide/glide-slide-button.h
similarity index 100%
rename from src/glide-slide-button.h
rename to libglide/glide-slide-button.h
diff --git a/src/glide-slide-priv.h b/libglide/glide-slide-priv.h
similarity index 100%
rename from src/glide-slide-priv.h
rename to libglide/glide-slide-priv.h
diff --git a/src/glide-slide.c b/libglide/glide-slide.c
similarity index 100%
rename from src/glide-slide.c
rename to libglide/glide-slide.c
diff --git a/src/glide-slide.h b/libglide/glide-slide.h
similarity index 100%
rename from src/glide-slide.h
rename to libglide/glide-slide.h
diff --git a/src/glide-stage-manager-priv.h b/libglide/glide-stage-manager-priv.h
similarity index 100%
rename from src/glide-stage-manager-priv.h
rename to libglide/glide-stage-manager-priv.h
diff --git a/src/glide-stage-manager.c b/libglide/glide-stage-manager.c
similarity index 100%
rename from src/glide-stage-manager.c
rename to libglide/glide-stage-manager.c
diff --git a/src/glide-stage-manager.h b/libglide/glide-stage-manager.h
similarity index 100%
rename from src/glide-stage-manager.h
rename to libglide/glide-stage-manager.h
diff --git a/src/glide-text.c b/libglide/glide-text.c
similarity index 100%
rename from src/glide-text.c
rename to libglide/glide-text.c
diff --git a/src/glide-text.h b/libglide/glide-text.h
similarity index 100%
rename from src/glide-text.h
rename to libglide/glide-text.h
diff --git a/src/glide-types.h b/libglide/glide-types.h
similarity index 100%
rename from src/glide-types.h
rename to libglide/glide-types.h
diff --git a/src/glide-undo-manager-priv.h b/libglide/glide-undo-manager-priv.h
similarity index 100%
rename from src/glide-undo-manager-priv.h
rename to libglide/glide-undo-manager-priv.h
diff --git a/src/glide-undo-manager.c b/libglide/glide-undo-manager.c
similarity index 100%
rename from src/glide-undo-manager.c
rename to libglide/glide-undo-manager.c
diff --git a/src/glide-undo-manager.h b/libglide/glide-undo-manager.h
similarity index 100%
rename from src/glide-undo-manager.h
rename to libglide/glide-undo-manager.h
diff --git a/src/glide-vala-animations.vala b/libglide/glide-vala-animations.vala
similarity index 100%
rename from src/glide-vala-animations.vala
rename to libglide/glide-vala-animations.vala
diff --git a/src/glide-window-private.h b/libglide/glide-window-private.h
similarity index 100%
rename from src/glide-window-private.h
rename to libglide/glide-window-private.h
diff --git a/src/glide-window.c b/libglide/glide-window.c
similarity index 100%
rename from src/glide-window.c
rename to libglide/glide-window.c
diff --git a/src/glide-window.h b/libglide/glide-window.h
similarity index 100%
rename from src/glide-window.h
rename to libglide/glide-window.h
diff --git a/src/glide.vapi b/libglide/glide.vapi
similarity index 100%
rename from src/glide.vapi
rename to libglide/glide.vapi
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d5f53a..b9cdb46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,7 @@
-## Process this file with automake to produce Makefile.in
-
-## Created by Anjuta
-
-BUILT_SOURCES =
+bin_PROGRAMS = glide
 
-AM_CPPFLAGS = \
+glide_SOURCES = main.c
+glide_CFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -15,96 +12,7 @@ AM_CPPFLAGS = \
 	$(GLIDE_DEBUG_CFLAGS) \
 	$(GOBJECT_INTROSPECTION_CFLAGS)
 
-AM_CFLAGS =\
-	 -g \
-	 -Wall 
-
-glide_VALASOURCES = \
-	glide-vala-animations.vala
-
-glide_VALABUILTSOURCES = $(glide_VALASOURCES:.vala=.c) 
-glide_VALABUILTSOURCES += glide-vala-animations.h
-
-if MAINTAINER_MODE
-BUILT_SOURCES += vala.stamp	
-vala.stamp: $(glide_VALASOURCES) glide.vapi
-	$(VALAC) --pkg clutter-1.0 -C -H glide-vala-animations.h $^ 
-	touch $@
-endif
-
-bin_PROGRAMS = glide
-
-glide_SOURCES = \
-	main.c \
-	glide-window.c \
-	glide-window.h \
-	glide-manipulator.c \
-	glide-manipulator.h \
-	glide-actor.c \
-	glide-actor.h \
-	glide-rectangle.c \
-	glide-rectangle.h \
-	glide-stage-manager.c \
-	glide-stage-manager.h \
-	glide-image.c \
-	glide-image.h \
-	glide-text.c \
-	glide-text.h \
-	glide-dirs.c \
-	glide-dirs.h \
-	glide-document.c \
-	glide-document.h \
-	glide-types.h \
-	glide-slide.h \
-	glide-slide.c \
-	glide-json-util.h \
-	glide-json-util.c \
-	glide-gtk-util.h \
-	glide-gtk-util.c \
-	glide-animations.c \
-	glide-animations.h \
-	glide-undo-manager.c \
-	glide-undo-manager.h \
-	glide-pdf-exporter.c \
-	glide-pdf-exporter.h \
-	glide-cairo-util.c \
-	glide-cairo-util.h \
-	glide-animation-manager.c \
-	glide-animation-manager.h \
-	glide-slide-button.c \
-	glide-slide-button.h \
-	glide-slide-box.c \
-	glide-slide-box.h \ 
-	glide-inspector-notebook.c \
-	glide-inspector-notebook.h \
-	glide-inspector-animation.c \
-	glide-inspector-animation.h \
-	glide-inspector-actor.c \
-	glide-inspector-actor.h \
-	glide-inspector-slide.c \
-	glide-inspector-slide.h \
-	glide-inspector-image.c \
-	glide-inspector-image.h \	
-	glide-inspector-text.c \
-	glide-inspector-text.h \
-	$(glide_VALABUILTSOURCES)
-
-
-glide_LDFLAGS = \
-	-Wl,--export-dynamic
-
-glide_LDADD = $(GTK_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(GOBJECT_INTROSPECTION_LIBS) $(JSON_GLIB_LIBS) $(GMODULE_LIBS)
-
-EXTRA_DIST = $(ui_DATA) \
-	     $(glide_VALASOURCES)
-
-if MAINTAINER_MODE
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(glide_VALABUILTSOURCES)
-endif
+glide_LDFLAGS = $(GTK_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(GOBJECT_INTROSPECTION_LIBS) $(JSON_GLIB_LIBS) $(GMODULE_LIBS) -Wl --export-dynamic
 
-# Remove ui directory on uninstall
-uninstall-local:
-	-rm -r $(uidir)
-	-rm -r $(datadir)/glide
+glide_LDADD = \
+	../libglide/libglide.la
diff --git a/src/main.c b/src/main.c
index 8899dd3..0d6ae29 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,9 +31,9 @@
 
 #include <glib/gi18n.h>
 
-#include "glide-window.h"
-#include "glide-animation-manager.h"
-#include "glide-debug.h"
+#include "../libglide/glide-window.h"
+#include "../libglide/glide-animation-manager.h"
+#include "../libglide/glide-debug.h"
 
 guint glide_debug_flags = 0;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]