From 9312c14b47a2d6e58238902d1424ae8d45d73ac5 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sat, 31 Jan 2009 19:33:40 +0100
Subject: Switch build system to cmake

lib{piano,wardrobe} are now static libraries and not installed any more.
---
 libwardrobe/ChangeLog       |  0
 libwardrobe/Makefile.am     |  1 -
 libwardrobe/NEWS            |  0
 libwardrobe/configure.in    | 33 ---------------------------------
 libwardrobe/src/Makefile.am |  6 ------
 libwardrobe/src/main.c      |  2 +-
 6 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 libwardrobe/ChangeLog
 delete mode 100644 libwardrobe/Makefile.am
 delete mode 100644 libwardrobe/NEWS
 delete mode 100644 libwardrobe/configure.in
 delete mode 100644 libwardrobe/src/Makefile.am

(limited to 'libwardrobe')

diff --git a/libwardrobe/ChangeLog b/libwardrobe/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/libwardrobe/Makefile.am b/libwardrobe/Makefile.am
deleted file mode 100644
index af437a6..0000000
--- a/libwardrobe/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src
diff --git a/libwardrobe/NEWS b/libwardrobe/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/libwardrobe/configure.in b/libwardrobe/configure.in
deleted file mode 100644
index 0333e58..0000000
--- a/libwardrobe/configure.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# init
-AC_INIT([libwardrobe], [0.1], [PromyLOPh@lavabit.com])
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_SRCDIR([src/main.c])
-AM_CONFIG_HEADER([src/config.h])
-AM_INIT_AUTOMAKE([-Wall])
-
-# progs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_SANITY_CHECK
-AM_PROG_LIBTOOL
-
-PKG_PROG_PKG_CONFIG
-
-# libs
-PKG_CHECK_MODULES(LIBCURL, libcurl >= 7.18.0)
-AC_SUBST(LIBCURL_CFLAGS)
-AC_SUBST(LIBCURL_LIBS)
-
-# headers
-AC_CHECK_HEADERS([stdlib.h string.h])
-
-# compiler characteristics
-AC_TYPE_SIZE_T
-
-# libc functions
-AC_CHECK_FUNCS([memset strchr strdup])
-
-# output
-AC_CONFIG_FILES(Makefile src/Makefile)
-
-AC_OUTPUT
diff --git a/libwardrobe/src/Makefile.am b/libwardrobe/src/Makefile.am
deleted file mode 100644
index 470635a..0000000
--- a/libwardrobe/src/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-lib_LTLIBRARIES = libwardrobe.la
-
-libwardrobe_la_SOURCES = main.c md5.c md5.h
-include_HEADERS = wardrobe.h
-libwardrobe_la_CPPFLAGS = ${LIBCURL_CFLAGS}
-libwardrobe_la_LIBADD = ${LIBCURL_LIBS}
diff --git a/libwardrobe/src/main.c b/libwardrobe/src/main.c
index abf669d..1872c69 100644
--- a/libwardrobe/src/main.c
+++ b/libwardrobe/src/main.c
@@ -107,7 +107,7 @@ void WardrobeHttpPost (CURL *ch, const char *url, const char *postData,
 void WardrobeInit (WardrobeHandle_t *wh) {
 	memset (wh, 0, sizeof (*wh));
 	wh->ch = curl_easy_init ();
-	curl_easy_setopt (wh->ch, CURLOPT_USERAGENT, PACKAGE_STRING);
+	curl_easy_setopt (wh->ch, CURLOPT_USERAGENT, PACKAGE);
 	curl_easy_setopt (wh->ch, CURLOPT_CONNECTTIMEOUT, 60);
 }
 
-- 
cgit v1.2.3