export some stuff, and pick up some compat stuff for FilePath

Distribution/Compat/FilePath.hs

@@ -23,6 +23,11 @@ module Distribution.Compat.FilePath
          , isPathSeparator
          , pathSeparator
          , searchPathSeparator
+
+	 -- * Filename extensions
+	 , exeExtension
+	 , objExtension
+	 , dllExtension
          ) where
 
 #if !__GLASGOW_HASKELL__ || __GLASGOW_HASKELL__ >= 603
@@ -372,3 +377,31 @@ searchPathSeparator = ':'
 #endif
 
 #endif
+-- ToDo: This should be determined via autoconf (AC_EXEEXT)
+-- | Extension for executable files
+-- (typically @\"\"@ on Unix and @\".exe\"@ on Windows or OS\/2)
+exeExtension :: String
+#ifdef mingw32_TARGET_OS
+exeExtension = ".exe"
+#else
+exeExtension = ""
+#endif
+
+-- ToDo: This should be determined via autoconf (AC_OBJEXT)
+-- | Extension for object files
+-- (typically @\".o\"@ on Unix and @\".obj\"@ on Windows)
+objExtension :: String
+#ifdef mingw32_TARGET_OS
+objExtension = ".obj"
+#else
+objExtension = ".o"
+#endif
+
+-- | Extension for dynamically linked (or shared) libraries
+-- (typically @\".so\"@ on Unix and @\".dll\"@ on Windows)
+dllExtension :: String
+#ifdef mingw32_TARGET_OS
+dllExtension = ".dll"
+#else
+dllExtension = ".so"
+#endif

Distribution/Simple.hs

@@ -48,7 +48,7 @@ module Distribution.Simple (
 	License(..), Version(..), VersionRange(..), 
 	orLaterVersion, orEarlierVersion, betweenVersionsInclusive,
 	Extension(..), Dependency(..),
-	defaultMain, defaultMainNoRead,
+	defaultMain, defaultMainNoRead, hookedPackageDesc,
 #ifdef DEBUG        
         simpleHunitTests
 #endif

TODO

 * misc
 ** two executables in same directory fails because both create Main.o
+** Executables that depend on the package itself
 ** make debian watchfile
 ** postinst, test
 ** multiple libraries?