diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000000..f375a989a1
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src/core
diff --git a/bench/Makefile.am b/bench/Makefile.am
new file mode 100644
index 0000000000..be0ebdbd24
--- /dev/null
+++ b/bench/Makefile.am
@@ -0,0 +1,19 @@
+AM_CPPFLAGS = -I$(top_builddir)/include/core -I$(top_builddir)/include/images
+AM_LDFLAGS = -lpng -lpthread
+
+bin_PROGRAMS = Bench
+Bench_SOURCES = RectBench.cpp \
+                SkBenchmark.cpp \
+                BenchTool/main.cpp \
+                $(top_builddir)/src/images/SkImageDecoder.cpp \
+                $(top_builddir)/src/images/SkImageDecoder_libpng.cpp \
+                $(top_builddir)/src/images/SkScaledBitmapSampler.cpp \
+                $(top_builddir)/src/ports/SkGlobals_global.cpp \
+                $(top_builddir)/src/ports/SkOSFile_stdio.cpp \
+                $(top_builddir)/src/ports/SkThread_pthread.cpp \
+                $(top_builddir)/src/ports/SkTime_Unix.cpp \
+                $(top_builddir)/src/ports/SkFontHost_none.cpp
+
+
+Bench_LDADD = $(top_builddir)/src/core/libskia.a 
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000000..5128718f72
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,11 @@
+AC_INIT([libskia], [1.0], [bug-automake@gnu.org])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AC_PROG_CXX
+AC_PROG_RANLIB
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([
+Makefile
+src/core/Makefile
+bench/Makefile
+])
+AC_OUTPUT
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
new file mode 100644
index 0000000000..02aef4e006
--- /dev/null
+++ b/src/core/Makefile.am
@@ -0,0 +1,88 @@
+AM_CPPFLAGS = -I$(top_builddir)/include/core
+
+noinst_LIBRARIES = libskia.a
+libskia_a_SOURCES = Sk64.cpp \
+SkAlphaRuns.cpp \
+SkBitmap.cpp \
+SkBitmapProcShader.cpp \
+SkBitmapProcState.cpp \
+SkBitmapProcState_matrixProcs.cpp \
+SkBitmapSampler.cpp \
+SkBitmapShader.cpp \
+SkBitmap_scroll.cpp \
+SkBlitRow_D16.cpp \
+SkBlitRow_D4444.cpp \
+SkBlitter.cpp \
+SkBlitter_4444.cpp \
+SkBlitter_A1.cpp \
+SkBlitter_A8.cpp \
+SkBlitter_ARGB32.cpp \
+SkBlitter_RGB16.cpp \
+SkBlitter_Sprite.cpp \
+SkBuffer.cpp \
+SkCanvas.cpp \
+SkChunkAlloc.cpp \
+SkColor.cpp \
+SkColorFilter.cpp \
+SkColorTable.cpp \
+SkComposeShader.cpp \
+SkCordic.cpp \
+SkDebug.cpp \
+SkDebug_stdio.cpp \
+SkDeque.cpp \
+SkDevice.cpp \
+SkDither.cpp \
+SkDraw.cpp \
+SkEdge.cpp \
+SkFilterProc.cpp \
+SkFlattenable.cpp \
+SkFloat.cpp \
+SkFloatBits.cpp \
+SkGeometry.cpp \
+SkGlobals.cpp \
+SkGlyphCache.cpp \
+SkGraphics.cpp \
+SkMMapStream.cpp \
+SkMask.cpp \
+SkMaskFilter.cpp \
+SkMath.cpp \
+SkMatrix.cpp \
+SkMemory_stdlib.cpp \
+SkPackBits.cpp \
+SkPaint.cpp \
+SkPath.cpp \
+SkPathEffect.cpp \
+SkPathHeap.cpp \
+SkPathMeasure.cpp \
+SkPicture.cpp \
+SkPictureFlat.cpp \
+SkPicturePlayback.cpp \
+SkPictureRecord.cpp \
+SkPixelRef.cpp \
+SkPoint.cpp \
+SkProcSpriteBlitter.cpp \
+SkPtrRecorder.cpp \
+SkRasterizer.cpp \
+SkRect.cpp \
+SkRefCnt.cpp \
+SkRegion.cpp \
+SkRegion_path.cpp \
+SkScalerContext.cpp \
+SkScan.cpp \
+SkScan_AntiPath.cpp \
+SkScan_Antihair.cpp \
+SkScan_Hairline.cpp \
+SkScan_Path.cpp \
+SkShader.cpp \
+SkSpriteBlitter_ARGB32.cpp \
+SkSpriteBlitter_RGB16.cpp \
+SkStream.cpp \
+SkString.cpp \
+SkStroke.cpp \
+SkStrokerPriv.cpp \
+SkTSearch.cpp \
+SkTypeface.cpp \
+SkUnPreMultiply.cpp \
+SkUtils.cpp \
+SkWriter32.cpp \
+SkXfermode.cpp