[commit: packages/time] format-widths, ghc, improve-leapseconds, master, posix-perf, tasty, wip/travis: make suitable for build process (7d86eaa)

git at git.haskell.org git at git.haskell.org
Fri Apr 21 16:46:51 UTC 2017


Repository : ssh://git@git.haskell.org/time

On branches: format-widths,ghc,improve-leapseconds,master,posix-perf,tasty,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3

>---------------------------------------------------------------

commit 7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 1 02:21:11 2006 -0700

    make suitable for build process
    
    darcs-hash:20060501092111-ac6dd-5bffa4956f92b470779215f8b501d2cb7e7fcafc


>---------------------------------------------------------------

7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3
 Makefile                           | 23 +++++++++++++++++++++++
 Setup.hs                           |  2 --
 timestuff.h => include/timestuff.h |  0
 time.cabal => package.conf.in      |  7 +++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..33c2a3f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SUBDIRS = 
+
+ALL_DIRS = \
+	Data \
+	Data/Time \
+	Data/Time/Calendar \
+	Data/Time/Clock \
+	Data/Time/LocalTime
+
+PACKAGE = time
+VERSION = 0.3.1
+PACKAGE_DEPS = base
+
+SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
+
+SRC_CC_OPTS += -Wall -Werror -Iinclude
+
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)"
+
+include $(TOP)/mk/target.mk
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
index 9a994af..0000000
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/timestuff.h b/include/timestuff.h
similarity index 100%
rename from timestuff.h
rename to include/timestuff.h
diff --git a/time.cabal b/package.conf.in
similarity index 90%
copy from time.cabal
copy to package.conf.in
index 4d8ebf5..eec6b3a 100644
--- a/time.cabal
+++ b/package.conf.in
@@ -1,11 +1,12 @@
-Name:		time
-Version:	0.3.1
+Name:		PACKAGE
+Version:	VERSION
 Stability:	Beta
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
+exposed:	True
 Category:
 Build-Depends:	base
 Synopsis:	time library
@@ -36,3 +37,5 @@ Other-modules:
 	Data.Time.LocalTime.TimeOfDay,
 	Data.Time.LocalTime.LocalTime,
 	Data.Time.LocalTime.Format
+include-dirs:		INCLUDE_DIR
+includes:		"timestuff.h"



More information about the ghc-commits mailing list