Changeset 12301 for third-party

Timestamp:

08/16/06 11:35:39 (2 years ago)

Author:

cmarcelo

Message:

* Uses AR to get judy object files into libHSHsJudy...a, so
we don't need -lJudy anymore (less pain?). Also gets rid of
some warnings in HsJudy? build. Need to test in win32.

Location:

third-party/HsJudy

Files:

• HsJudy.cabal (modified) (1 diff)
• Judy/BitSet.hs (modified) (1 diff)
• Judy/Hash.hs (modified) (1 diff)
• Judy/IntMap.hs (modified) (1 diff)
• Judy/MiniGC.hs (modified) (1 diff)
• Judy/Private.hsc (modified) (1 diff)
• Judy/StrMap.hs (modified) (1 diff)

third-party/HsJudy/HsJudy.cabal

@@ -10 +10 @@
 other-modules:       Judy.Private Judy.MiniGC
 extensions:          ForeignFunctionInterface
-ghc-options:         -fglasgow-exts -O2 -static
+ghc-options:         -fglasgow-exts -O2 -static ../judy/Judy-1.0.3/src/Judy1/*.o ../judy/Judy-1.0.3/src/JudyL/*.o ../judy/Judy-1.0.3/src/JudySL/*.o ../judy/Judy-1.0.3/src/JudyHS/*.o ../judy/Judy-1.0.3/src/JudyCommon/*.o
 include-dirs:        . ../judy/Judy-1.0.3/src
 -- FIXME: make Cabal work nicely with _hsc files, now I think it works, but doesnt clean _hsc files
 c-sources:           Judy/Private_hsc.c
-extra-libraries:     Judy
-extra-lib-dirs:      .

third-party/HsJudy/Judy/BitSet.hs

@@ -1 +1 @@
 {-# OPTIONS -fallow-undecidable-instances -fallow-incoherent-instances #-}
+
+{-# INCLUDE "Judy.h" #-}
 
 module Judy.BitSet where

third-party/HsJudy/Judy/Hash.hs

@@ -1 +1 @@
 {-# OPTIONS -fallow-undecidable-instances -fallow-incoherent-instances #-}
+
+{-# INCLUDE "Judy.h" #-}
 
 module Judy.Hash (

third-party/HsJudy/Judy/IntMap.hs

@@ -1 +1 @@
 {-# OPTIONS -fallow-undecidable-instances -fallow-incoherent-instances #-}
+
+{-# INCLUDE "Judy.h" #-}
 
 module Judy.IntMap (

third-party/HsJudy/Judy/MiniGC.hs

@@ +1 @@
+
+{-# INCLUDE "Judy.h" #-}
+
 module Judy.MiniGC (
     judyGC, newRef, freeRef

third-party/HsJudy/Judy/Private.hsc

@@ -12 +12 @@
 import Foreign.C.Types
 import Foreign.C.String
+
+{-# INCLUDE "Judy.h" #-}
 
 #include <Judy.h>

third-party/HsJudy/Judy/StrMap.hs

@@ -1 +1 @@
 {-# OPTIONS -fallow-undecidable-instances -fallow-incoherent-instances #-}
+
+{-# INCLUDE "Judy.h" #-}
 
 module Judy.StrMap (