From 454110e1b17214b220317704f092bd3587b88a9d Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sat, 9 May 2009 13:08:34 +0200
Subject: Switch to cmake

"Works for now..."
---
 libmpio/.gitignore     |  1 +
 libmpio/CMakeLists.txt | 15 +++++++++++++++
 libmpio/Makefile.am    | 40 ----------------------------------------
 libmpio/debug.h        |  2 +-
 4 files changed, 17 insertions(+), 41 deletions(-)
 create mode 100644 libmpio/.gitignore
 create mode 100644 libmpio/CMakeLists.txt
 delete mode 100644 libmpio/Makefile.am

(limited to 'libmpio')

diff --git a/libmpio/.gitignore b/libmpio/.gitignore
new file mode 100644
index 0000000..10301e2
--- /dev/null
+++ b/libmpio/.gitignore
@@ -0,0 +1 @@
+*.a
diff --git a/libmpio/CMakeLists.txt b/libmpio/CMakeLists.txt
new file mode 100644
index 0000000..917833d
--- /dev/null
+++ b/libmpio/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required (VERSION 2.4)
+
+set (PACKAGE libmpio)
+project (${PACKAGE} C)
+
+set (CMAKE_C_FLAGS -Wall)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}/mplib)
+
+add_library (mpio STATIC src/mpio.c src/io.c src/debug.c src/smartmedia.c
+	src/mmc.c src/directory.c src/fat.c src/ecc.c src/cis.c src/id3.c
+	mplib/mplib.c mplib/mplib_paas.c mplib/mplib_s.c mplib/xmalloc.c)
+
+target_link_libraries (mpio -lusb)
diff --git a/libmpio/Makefile.am b/libmpio/Makefile.am
deleted file mode 100644
index 2b55f7f..0000000
--- a/libmpio/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-INCLUDES=@MPLIB_INCLUDE@ 
-AM_CFLAGS=@MPLIB_CFLAGS@ @USB_CFLAGS@
-AM_LDFLAGS=-version-info 1:0:0 @USB_LIBS@
-
-lib_LTLIBRARIES=libmpio.la 
-
-libmpio_la_SOURCES= \
-		src/mpio.c \
-		src/io.c \
-		src/debug.c \
-		src/smartmedia.c \
-		src/mmc.c \
-		src/directory.c \
-		src/fat.c \
-		src/ecc.c \
-		src/cis.c \
-		src/id3.c \
-		mplib/mplib.c \
-		mplib/mplib_paas.c \
-		mplib/mplib_s.c \
-		mplib/xmalloc.c
-
-pkginclude_HEADERS= \
-		mpio.h \
-		defs.h
-
-noinst_HEADERS= \
-		debug.h \
-		src/io.h \
-		src/smartmedia.h \
-		src/mmc.h \
-		src/directory.h \
-		src/fat.h \
-		src/ecc.h \
-		src/cis.h \
-		src/id3.h \
-		mplib/mplib.h \
-		mplib/mplib_s.h \
-		mplib/xmalloc.h
-
diff --git a/libmpio/debug.h b/libmpio/debug.h
index c523310..eee3a72 100644
--- a/libmpio/debug.h
+++ b/libmpio/debug.h
@@ -31,7 +31,7 @@
 #ifdef PACKAGE
 #define DPACKAGE PACKAGE
 #else
-#define DPACKAGE unknown
+#define DPACKAGE "unknown"
 #endif
 
 #endif
-- 
cgit v1.2.3