diff --git a/Makefile b/Makefile index a5c8082..33eb91c 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,13 @@ all: build EvalHaskell.h build:: - cd plugins ;\ + cd src ;\ $(GHC) -o setup --make Setup.hs ;\ ./setup configure --prefix=$(PREFIX) --with-happy=$(TOP)/happy.sh ;\ ./setup build EvalHaskell.h: build - cp plugins/System/Eval/Haskell_stub.h $@ + cp src/System/Eval/Haskell_stub.h $@ # # installing @@ -26,7 +26,7 @@ install: $(INSTALL_DATA) EvalHaskell.h $(LIBDIR)/include $(INSTALL_DATA_DIR) $(MANDIR)/man1 $(INSTALL_DATA) docs/hs-plugins.1 $(MANDIR)/man1 - cd plugins && ./setup install + cd src && ./setup install # # regress check. TODO check expected output @@ -55,8 +55,8 @@ CLEAN_FILES += *.conf.*.old *~ clean: cd docs && $(MAKE) clean - cd plugins && ./setup clean 2> /dev/null || true - cd plugins && rm -rf dist Setup.hi Setup.o setup + cd src && ./setup clean 2> /dev/null || true + cd src && rm -rf dist Setup.hi Setup.o setup rm -rf $(CLEAN_FILES) find examples -name '*.a' -exec rm {} \; find examples -name '*~' -exec rm {} \; diff --git a/plugins/AltData/Dynamic.hs b/src/AltData/Dynamic.hs similarity index 100% rename from plugins/AltData/Dynamic.hs rename to src/AltData/Dynamic.hs diff --git a/plugins/AltData/Typeable.hs b/src/AltData/Typeable.hs similarity index 100% rename from plugins/AltData/Typeable.hs rename to src/AltData/Typeable.hs diff --git a/plugins/Language/Hi/Binary.hs b/src/Language/Hi/Binary.hs similarity index 100% rename from plugins/Language/Hi/Binary.hs rename to src/Language/Hi/Binary.hs diff --git a/plugins/Language/Hi/FastMutInt.hs b/src/Language/Hi/FastMutInt.hs similarity index 100% rename from plugins/Language/Hi/FastMutInt.hs rename to src/Language/Hi/FastMutInt.hs diff --git a/plugins/Language/Hi/FastString.hs b/src/Language/Hi/FastString.hs similarity index 100% rename from plugins/Language/Hi/FastString.hs rename to src/Language/Hi/FastString.hs diff --git a/plugins/Language/Hi/Parser.hs b/src/Language/Hi/Parser.hs similarity index 100% rename from plugins/Language/Hi/Parser.hs rename to src/Language/Hi/Parser.hs diff --git a/plugins/Language/Hi/PrimPacked.hs b/src/Language/Hi/PrimPacked.hs similarity index 100% rename from plugins/Language/Hi/PrimPacked.hs rename to src/Language/Hi/PrimPacked.hs diff --git a/plugins/Language/Hi/Syntax.hs b/src/Language/Hi/Syntax.hs similarity index 100% rename from plugins/Language/Hi/Syntax.hs rename to src/Language/Hi/Syntax.hs diff --git a/plugins/Language/Hi/hschooks.c b/src/Language/Hi/hschooks.c similarity index 100% rename from plugins/Language/Hi/hschooks.c rename to src/Language/Hi/hschooks.c diff --git a/plugins/Language/Hi/hschooks.h b/src/Language/Hi/hschooks.h similarity index 100% rename from plugins/Language/Hi/hschooks.h rename to src/Language/Hi/hschooks.h diff --git a/plugins/Setup.hs b/src/Setup.hs similarity index 100% rename from plugins/Setup.hs rename to src/Setup.hs diff --git a/plugins/System/Eval.hs b/src/System/Eval.hs similarity index 100% rename from plugins/System/Eval.hs rename to src/System/Eval.hs diff --git a/plugins/System/Eval/Haskell.hs b/src/System/Eval/Haskell.hs similarity index 100% rename from plugins/System/Eval/Haskell.hs rename to src/System/Eval/Haskell.hs diff --git a/plugins/System/Eval/Utils.hs b/src/System/Eval/Utils.hs similarity index 100% rename from plugins/System/Eval/Utils.hs rename to src/System/Eval/Utils.hs diff --git a/plugins/System/MkTemp.hs b/src/System/MkTemp.hs similarity index 100% rename from plugins/System/MkTemp.hs rename to src/System/MkTemp.hs diff --git a/plugins/System/Plugins.hs b/src/System/Plugins.hs similarity index 100% rename from plugins/System/Plugins.hs rename to src/System/Plugins.hs diff --git a/plugins/System/Plugins/Consts.hs b/src/System/Plugins/Consts.hs similarity index 100% rename from plugins/System/Plugins/Consts.hs rename to src/System/Plugins/Consts.hs diff --git a/plugins/System/Plugins/Env.hs b/src/System/Plugins/Env.hs similarity index 100% rename from plugins/System/Plugins/Env.hs rename to src/System/Plugins/Env.hs diff --git a/plugins/System/Plugins/Load.hs b/src/System/Plugins/Load.hs similarity index 100% rename from plugins/System/Plugins/Load.hs rename to src/System/Plugins/Load.hs diff --git a/plugins/System/Plugins/LoadTypes.hs b/src/System/Plugins/LoadTypes.hs similarity index 100% rename from plugins/System/Plugins/LoadTypes.hs rename to src/System/Plugins/LoadTypes.hs diff --git a/plugins/System/Plugins/Make.hs b/src/System/Plugins/Make.hs similarity index 100% rename from plugins/System/Plugins/Make.hs rename to src/System/Plugins/Make.hs diff --git a/plugins/System/Plugins/Package.hs b/src/System/Plugins/Package.hs similarity index 100% rename from plugins/System/Plugins/Package.hs rename to src/System/Plugins/Package.hs diff --git a/plugins/System/Plugins/PackageAPI.hs b/src/System/Plugins/PackageAPI.hs similarity index 100% rename from plugins/System/Plugins/PackageAPI.hs rename to src/System/Plugins/PackageAPI.hs diff --git a/plugins/System/Plugins/ParsePkgConfCabal.hs b/src/System/Plugins/ParsePkgConfCabal.hs similarity index 100% rename from plugins/System/Plugins/ParsePkgConfCabal.hs rename to src/System/Plugins/ParsePkgConfCabal.hs diff --git a/plugins/System/Plugins/ParsePkgConfCabal.y b/src/System/Plugins/ParsePkgConfCabal.y similarity index 100% rename from plugins/System/Plugins/ParsePkgConfCabal.y rename to src/System/Plugins/ParsePkgConfCabal.y diff --git a/plugins/System/Plugins/ParsePkgConfLite.hs b/src/System/Plugins/ParsePkgConfLite.hs similarity index 100% rename from plugins/System/Plugins/ParsePkgConfLite.hs rename to src/System/Plugins/ParsePkgConfLite.hs diff --git a/plugins/System/Plugins/ParsePkgConfLite.y b/src/System/Plugins/ParsePkgConfLite.y similarity index 100% rename from plugins/System/Plugins/ParsePkgConfLite.y rename to src/System/Plugins/ParsePkgConfLite.y diff --git a/plugins/System/Plugins/Parser.hs b/src/System/Plugins/Parser.hs similarity index 100% rename from plugins/System/Plugins/Parser.hs rename to src/System/Plugins/Parser.hs diff --git a/plugins/System/Plugins/Utils.hs b/src/System/Plugins/Utils.hs similarity index 100% rename from plugins/System/Plugins/Utils.hs rename to src/System/Plugins/Utils.hs diff --git a/plugins/plugins.cabal b/src/plugins.cabal similarity index 100% rename from plugins/plugins.cabal rename to src/plugins.cabal