[ease] [build] Build ease in subdirectory, rename src->ease.



commit ef876655da7c948b9e47912a8bba0619961c412b
Author: Nate Stedman <natesm gmail com>
Date:   Sat Aug 7 00:14:51 2010 -0400

    [build] Build ease in subdirectory, rename src->ease.

 .gitignore                                        |    2 +-
 Makefile.am                                       |   60 ++-------------------
 autogen.sh                                        |    2 +-
 configure.ac                                      |   16 +++---
 ease-core/Makefile.am                             |    4 +-
 ease/Makefile.am                                  |   57 +++++++++++++++++++
 {src => ease}/ease-about-dialog.vala              |    0
 {src => ease}/ease-close-confirm-dialog.vala      |    0
 {src => ease}/ease-editor-embed.vala              |    0
 {src => ease}/ease-editor-window.vala             |    0
 {src => ease}/ease-handle.vala                    |    0
 {src => ease}/ease-inspector-element-pane.vala    |    0
 {src => ease}/ease-inspector-pane.vala            |    0
 {src => ease}/ease-inspector-slide-pane.vala      |    0
 {src => ease}/ease-inspector-transition-pane.vala |    0
 {src => ease}/ease-inspector.vala                 |    0
 {src => ease}/ease-main.vala                      |    0
 {src => ease}/ease-player.vala                    |    0
 {src => ease}/ease-scrollable-embed.vala          |    0
 {src => ease}/ease-selection-rectangle.vala       |    0
 {src => ease}/ease-slide-actor.vala               |    0
 {src => ease}/ease-slide-button-panel.vala        |    0
 {src => ease}/ease-slide-sorter.vala              |    0
 {src => ease}/ease-welcome-actor.vala             |    0
 {src => ease}/ease-welcome-window.vala            |    0
 25 files changed, 73 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19107cc..ae5a2a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ libease/tmp-introspect*
 *.gir
 
 # build files
-ease
+ease/ease
 *.h
 *.o
 *.lo
diff --git a/Makefile.am b/Makefile.am
index 8926b89..5b88ae3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,61 +1,6 @@
 NULL =
 
-SUBDIRS = po data flutter ease-core
-	
-bin_PROGRAMS = ease
-
-# source files
-ease_SOURCES = \
-	src/ease-about-dialog.vala \
-	src/ease-close-confirm-dialog.vala \
-	src/ease-editor-embed.vala \
-	src/ease-editor-window.vala \
-	src/ease-handle.vala \
-	src/ease-inspector-element-pane.vala \
-	src/ease-inspector-pane.vala \
-	src/ease-inspector-slide-pane.vala \
-	src/ease-inspector-transition-pane.vala \
-	src/ease-inspector.vala \
-	src/ease-main.vala \
-	src/ease-player.vala \
-	src/ease-scrollable-embed.vala \
-	src/ease-selection-rectangle.vala \
-	src/ease-slide-actor.vala \
-	src/ease-slide-button-panel.vala \
-	src/ease-slide-sorter.vala \
-	src/ease-welcome-actor.vala \
-	src/ease-welcome-window.vala
-
-# compiler flags
-ease_VALAFLAGS = \
-	--pkg ease-core-0.3 \
-	--pkg flutter-0.3 \
-	--disable-warnings \
-	$(EASE_PACKAGES) \
-	--vapidir vapi \
-	--thread \
-	-g
-
-ease_LDADD = \
-	./ease-core/libease-core-0.3.la \
-	./flutter/libflutter-0.3.la \
-	-lm \
-	$(EASE_LIBS) \
-	$(NULL)
-	
-INCLUDES = \
-	-include config.h \
-	$(EASE_CFLAGS)
-
-EASE_CFLAGS += -w -I./ease-core/ -I./flutter
-
-AM_CPPFLAGS = \
-	$(EASE_CFLAGS) \
-	-include $(CONFIG_HEADER) \
-	-O0 \
-	$(NULL)
-
-CLEANFILES = $(subst .vala,.c,$(ease_SOURCES))
+SUBDIRS = po data flutter ease-core ease
 
 # distribution
 EXTRA_DIST = data/ease.desktop.in.in  \
@@ -70,6 +15,9 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
     pkgconfig/ease-core-0.3.pc \
     pkgconfig/flutter-0.3.pc
+    
+run: ease/ease
+	ease/ease
 
 doc: ease-core/*.vala
 	rm -rf doc
diff --git a/autogen.sh b/autogen.sh
index bc15f53..b693d9f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="ease"
 REQUIRED_AUTOMAKE_VERSION=1.11
 
-(test -f $srcdir/src/ease-main.vala) || {
+(test -f $srcdir/ease/ease-main.vala) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index 9be07bc..62c1a4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,13 +2,15 @@ AC_INIT([Ease], [0.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=ease],
 
 AC_PREREQ([2.59])
 
-AC_CONFIG_FILES([Makefile
-	  po/Makefile.in
-	  data/Makefile
-	  ease-core/Makefile
-	  flutter/Makefile
-	  pkgconfig/ease-core-0.3.pc
-	  pkgconfig/flutter-0.3.pc])
+AC_CONFIG_FILES([
+	Makefile
+	po/Makefile.in
+	data/Makefile
+	ease-core/Makefile
+	flutter/Makefile
+	ease/Makefile
+	pkgconfig/ease-core-0.3.pc
+	pkgconfig/flutter-0.3.pc])
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 9aef3eb..490b206 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -72,9 +72,7 @@ libease_core_0_3_la_VALAFLAGS = \
 
 libease_core_0_3_la_LIBADD = ../flutter/libflutter-0.3.la
 libease_core_0_3_la_CFLAGS = $(EASE_CFLAGS)
-libease_core_0_3_la_LDFLAGS = $(EASE_LDFLAGS)
-
-# build typelib
+libease_core_0_3_la_LDFLAGS = $(EASE_LDFLAGS) --export-dynamic
 
 # header installation
 libease_includedir=$(includedir)/ease/
diff --git a/ease/Makefile.am b/ease/Makefile.am
new file mode 100644
index 0000000..39e4617
--- /dev/null
+++ b/ease/Makefile.am
@@ -0,0 +1,57 @@
+# build ease executable
+bin_PROGRAMS = ease
+
+# source files
+ease_SOURCES = \
+	ease-about-dialog.vala \
+	ease-close-confirm-dialog.vala \
+	ease-editor-embed.vala \
+	ease-editor-window.vala \
+	ease-handle.vala \
+	ease-inspector-element-pane.vala \
+	ease-inspector-pane.vala \
+	ease-inspector-slide-pane.vala \
+	ease-inspector-transition-pane.vala \
+	ease-inspector.vala \
+	ease-main.vala \
+	ease-player.vala \
+	ease-scrollable-embed.vala \
+	ease-selection-rectangle.vala \
+	ease-slide-actor.vala \
+	ease-slide-button-panel.vala \
+	ease-slide-sorter.vala \
+	ease-welcome-actor.vala \
+	ease-welcome-window.vala
+
+# compiler flags
+ease_VALAFLAGS = \
+	--pkg ease-core-0.3 \
+	--pkg flutter-0.3 \
+	--disable-warnings \
+	$(EASE_PACKAGES) \
+	--vapidir ../vapi \
+	--thread \
+	-g
+
+EASE_CFLAGS += -w -I../ease-core/ -I../flutter
+ease_LDFLAGS = --export-dynamic
+
+ease_LDADD = \
+	../ease-core/libease-core-0.3.la \
+	../flutter/libflutter-0.3.la \
+	-lm \
+	$(EASE_LIBS) \
+	$(NULL)
+	
+INCLUDES = \
+	-include ../config.h \
+	$(EASE_CFLAGS)
+
+AM_CPPFLAGS = \
+	$(EASE_CFLAGS) \
+	-include $(CONFIG_HEADER) \
+	-O0 \
+	$(NULL)
+
+CLEANFILES = $(subst .vala,.c,$(ease_SOURCES))
+
diff --git a/src/ease-about-dialog.vala b/ease/ease-about-dialog.vala
similarity index 100%
rename from src/ease-about-dialog.vala
rename to ease/ease-about-dialog.vala
diff --git a/src/ease-close-confirm-dialog.vala b/ease/ease-close-confirm-dialog.vala
similarity index 100%
rename from src/ease-close-confirm-dialog.vala
rename to ease/ease-close-confirm-dialog.vala
diff --git a/src/ease-editor-embed.vala b/ease/ease-editor-embed.vala
similarity index 100%
rename from src/ease-editor-embed.vala
rename to ease/ease-editor-embed.vala
diff --git a/src/ease-editor-window.vala b/ease/ease-editor-window.vala
similarity index 100%
rename from src/ease-editor-window.vala
rename to ease/ease-editor-window.vala
diff --git a/src/ease-handle.vala b/ease/ease-handle.vala
similarity index 100%
rename from src/ease-handle.vala
rename to ease/ease-handle.vala
diff --git a/src/ease-inspector-element-pane.vala b/ease/ease-inspector-element-pane.vala
similarity index 100%
rename from src/ease-inspector-element-pane.vala
rename to ease/ease-inspector-element-pane.vala
diff --git a/src/ease-inspector-pane.vala b/ease/ease-inspector-pane.vala
similarity index 100%
rename from src/ease-inspector-pane.vala
rename to ease/ease-inspector-pane.vala
diff --git a/src/ease-inspector-slide-pane.vala b/ease/ease-inspector-slide-pane.vala
similarity index 100%
rename from src/ease-inspector-slide-pane.vala
rename to ease/ease-inspector-slide-pane.vala
diff --git a/src/ease-inspector-transition-pane.vala b/ease/ease-inspector-transition-pane.vala
similarity index 100%
rename from src/ease-inspector-transition-pane.vala
rename to ease/ease-inspector-transition-pane.vala
diff --git a/src/ease-inspector.vala b/ease/ease-inspector.vala
similarity index 100%
rename from src/ease-inspector.vala
rename to ease/ease-inspector.vala
diff --git a/src/ease-main.vala b/ease/ease-main.vala
similarity index 100%
rename from src/ease-main.vala
rename to ease/ease-main.vala
diff --git a/src/ease-player.vala b/ease/ease-player.vala
similarity index 100%
rename from src/ease-player.vala
rename to ease/ease-player.vala
diff --git a/src/ease-scrollable-embed.vala b/ease/ease-scrollable-embed.vala
similarity index 100%
rename from src/ease-scrollable-embed.vala
rename to ease/ease-scrollable-embed.vala
diff --git a/src/ease-selection-rectangle.vala b/ease/ease-selection-rectangle.vala
similarity index 100%
rename from src/ease-selection-rectangle.vala
rename to ease/ease-selection-rectangle.vala
diff --git a/src/ease-slide-actor.vala b/ease/ease-slide-actor.vala
similarity index 100%
rename from src/ease-slide-actor.vala
rename to ease/ease-slide-actor.vala
diff --git a/src/ease-slide-button-panel.vala b/ease/ease-slide-button-panel.vala
similarity index 100%
rename from src/ease-slide-button-panel.vala
rename to ease/ease-slide-button-panel.vala
diff --git a/src/ease-slide-sorter.vala b/ease/ease-slide-sorter.vala
similarity index 100%
rename from src/ease-slide-sorter.vala
rename to ease/ease-slide-sorter.vala
diff --git a/src/ease-welcome-actor.vala b/ease/ease-welcome-actor.vala
similarity index 100%
rename from src/ease-welcome-actor.vala
rename to ease/ease-welcome-actor.vala
diff --git a/src/ease-welcome-window.vala b/ease/ease-welcome-window.vala
similarity index 100%
rename from src/ease-welcome-window.vala
rename to ease/ease-welcome-window.vala



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]