From 5b006c766e11b2aa6b53a55c37af90216c22df56 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@jitted.com>
Date: Mon, 27 Dec 2010 23:30:03 +0000
Subject: [PATCH] reorganize
---
Makefile.am | 10 +++++++++
src/Makefile.include => Makefile.include | 0
src/autogen.sh => autogen.sh | 2 +-
src/configure.ac => configure.ac | 26 ++++++++++++------------
{src => m4}/expansions.m4 | 0
src/Makefile.am | 4 ++--
6 files changed, 26 insertions(+), 16 deletions(-)
create mode 100644 Makefile.am
rename src/Makefile.include => Makefile.include (100%)
rename src/autogen.sh => autogen.sh (98%)
rename src/configure.ac => configure.ac (79%)
rename {src => m4}/expansions.m4 (100%)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..c7e0ac99
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,10 @@
+
+EXTRA_DIST = expansions.m4
+
+#Warning: This is an automatically generated file, do not edit!
+if ENABLE_DEBUG
+ SUBDIRS = src
+endif
+if ENABLE_RELEASE
+ SUBDIRS = src
+endif
diff --git a/src/Makefile.include b/Makefile.include
similarity index 100%
rename from src/Makefile.include
rename to Makefile.include
diff --git a/src/autogen.sh b/autogen.sh
similarity index 98%
rename from src/autogen.sh
rename to autogen.sh
index e8428b6e..1aa2ec76 100755
--- a/src/autogen.sh
+++ b/autogen.sh
@@ -17,7 +17,7 @@ test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
TEST_TYPE=-f
-aclocalinclude="-I . $ACLOCAL_FLAGS"
+aclocalinclude="-I . -I m4 $ACLOCAL_FLAGS"
DIE=0
diff --git a/src/configure.ac b/configure.ac
similarity index 79%
rename from src/configure.ac
rename to configure.ac
index cd9fed4a..ac0e31cd 100644
--- a/src/configure.ac
+++ b/configure.ac
@@ -51,20 +51,20 @@ dnl package checks, per config
AC_CONFIG_FILES([
-Mono.VisualC.Interop/mono.visualc.interop.pc
-Mono.VisualC.Interop/Makefile
-Tests/tests.pc
-Tests/Makefile
-QtBindings/qtbindings.pc
-QtBindings/Makefile
-Mono.VisualC.Code/mono.visualc.code.pc
-Mono.VisualC.Code/Makefile
-generator/generator
-generator/Makefile
-QtTest/qttest
-QtTest/Makefile
+src/Mono.VisualC.Interop/mono.visualc.interop.pc
+src/Mono.VisualC.Interop/Makefile
+src/Tests/tests.pc
+src/Tests/Makefile
+src/QtBindings/qtbindings.pc
+src/QtBindings/Makefile
+src/Mono.VisualC.Code/mono.visualc.code.pc
+src/Mono.VisualC.Code/Makefile
+src/generator/generator
+src/generator/Makefile
+src/QtTest/qttest
+src/QtTest/Makefile
+src/Makefile
Makefile
-
])
AC_OUTPUT
diff --git a/src/expansions.m4 b/m4/expansions.m4
similarity index 100%
rename from src/expansions.m4
rename to m4/expansions.m4
diff --git a/src/Makefile.am b/src/Makefile.am
index c316f5d5..7bc94dd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@ EXTRA_DIST = expansions.m4
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG
- SUBDIRS = Mono.VisualC.Interop Tests QtBindings Mono.VisualC.Code generator QtTest
+ SUBDIRS = Mono.VisualC.Interop QtBindings Mono.VisualC.Code generator QtTest
endif
if ENABLE_RELEASE
- SUBDIRS = Mono.VisualC.Interop Tests QtBindings Mono.VisualC.Code generator QtTest
+ SUBDIRS = Mono.VisualC.Interop QtBindings Mono.VisualC.Code generator QtTest
endif