Commit 9e0a8b50 authored by Michael Hanus 's avatar Michael Hanus
Browse files

Makefiles adapted to hierarchical FlatCurry libs

parent c02a4e7b
......@@ -16,7 +16,7 @@ module AnalysisServer(main, initializeAnalysisSystem, analyzeModuleAsText,
import ReadNumeric(readNat)
import Char(isSpace)
import Directory
import FlatCurry(QName)
import FlatCurry.Types(QName)
import Socket(Socket(..),listenOn,listenOnFresh,sClose,waitForSocketAccept)
import IO
import ReadShowTerm(readQTerm,showQTerm)
......
......@@ -16,7 +16,7 @@ DEPS = Analysis.curry AnalysisCollection.curry AnalysisDependencies.curry \
LoadAnalysis.curry SCC.curry ServerFormats.curry \
ServerFunctions.curry WorkerFunctions.curry \
$(LIBDIR)/Distribution.curry $(LIBDIR)/PropertyFile.curry \
$(METADIR)/FlatCurry.curry $(ANADIR)/*.curry
$(LIBDIR)/FlatCurry/*.curry $(ANADIR)/*.curry
.PHONY: all compile install clean uninstall
......
......@@ -9,7 +9,7 @@
module ServerFormats(serverFormats,formatResult) where
import GenericProgInfo
import FlatCurry(QName,showQNameInModule)
import FlatCurry.Types(QName,showQNameInModule)
import XML
--------------------------------------------------------------------
......
......@@ -7,7 +7,6 @@ ROOT ?= $(error Please specify the variable ROOT)
export BINDIR = $(ROOT)/bin
export LIBDIR = $(ROOT)/lib
export METADIR = $(LIBDIR)/meta
export CLEANCURRY = $(BINDIR)/cleancurry
export REPL = $(BINDIR)/curry
......
......@@ -18,7 +18,8 @@ DEPS = BrowserGUI.curry ShowFlatCurry.curry Imports.curry \
$(CURRYTOOLS)/addtypes/AddTypes.curry \
$(CURRYTOOLS)/importcalls/ImportCalls.curry \
$(LIBDIR)/GUI.curry $(LIBDIR)/IOExts.curry $(LIBDIR)/System.curry \
$(METADIR)/FlatCurry.curry $(METADIR)/FlatCurryShow.curry \
$(LIBDIR)/FlatCurry/Types.curry $(LIBDIR)/FlatCurry/Files.curry \
$(LIBDIR)/FlatCurry/Show.curry \
analysis/*.curry $(ANADIR)/*.curry
LOADPATH = analysis:$(CASS):$(ANADIR):$(CURRYTOOLS)/importcalls:$(CURRYTOOLS)/addtypes
......
......@@ -21,7 +21,9 @@ uninstall: clean
# generate executable for CreateMakefile program
CreateMakefile: CreateMakefile.curry \
$(METADIR)/FlatCurry.curry $(METADIR)/FlatCurryRead.curry \
$(LIBDIR)/FlatCurry/Types.curry \
$(LIBDIR)/FlatCurry/Files.curry \
$(LIBDIR)/FlatCurry/Read.curry \
$(LIBDIR)/FilePath.curry \
$(LIBDIR)/PropertyFile.curry \
$(LIBDIR)/ReadShowTerm.curry \
......
......@@ -22,5 +22,5 @@ uninstall: clean
# generate executable for the Curry2JavaScript translator
Curry2JS: Curry2JS.curry $(LIBDIR)/JavaScript.curry \
$(METADIR)/CompactFlatCurry.curry $(METADIR)/FlatCurry.curry
$(LIBDIR)/FlatCurry/*.curry
$(REPL) $(REPL_OPTS) :load Curry2JS :save :quit
......@@ -16,10 +16,10 @@ DEPS = CurryDoc.curry CurryDocRead.curry CurryDocHtml.curry \
CurryDocParams.curry CurryDocConfig.curry \
BootstrapStyle.curry \
$(LIBDIR)/Markdown.curry \
$(METADIR)/FlexRigid.curry \
$(LIBDIR)/FlatCurry/FlexRigid.curry \
$(LIBDIR)/CategorizedHtmlList.curry \
$(LIBDIR)/Distribution.curry $(LIBDIR)/PropertyFile.curry \
$(METADIR)/FlatCurry.curry \
$(LIBDIR)/FlatCurry/Types.curry $(LIBDIR)/FlatCurry/Files.curry \
$(LIBDIR)/HTML.curry $(LIBDIR)/HtmlParser.curry \
$(CASS)/AnalysisServer.curry \
$(ANADIR)/Deterministic.curry $(ANADIR)/TotallyDefined.curry \
......
......@@ -18,7 +18,8 @@ import Read
import Assertion
import System
import List
import FlatCurry
import FlatCurry.Types
import FlatCurry.Files
import IO
import IOExts -- use IORefs
import FileGoodies (stripSuffix)
......
......@@ -19,7 +19,7 @@ clean:
uninstall: clean
rm -f $(TOOL)
CurryTest: CurryTest.curry $(METADIR)/FlatCurry.curry \
CurryTest: CurryTest.curry $(LIBDIR)/FlatCurry/Files.curry \
$(LIBDIR)/System.curry $(LIBDIR)/Assertion.curry \
$(LIBDIR)/Directory.curry $(LIBDIR)/Distribution.curry \
$(LIBDIR)/GUI.curry
......
......@@ -17,7 +17,5 @@ clean:
uninstall: clean
# generate executable for currydoc program:
GenInt: GenInt.curry $(METADIR)/FlatCurry.curry \
$(METADIR)/FlatCurryShow.curry $(METADIR)/FlexRigid.curry \
$(LIBDIR)/List.curry
GenInt: GenInt.curry $(LIBDIR)/FlatCurry/*.curry $(LIBDIR)/List.curry
$(REPL) $(REPL_OPTS) :load GenInt :save :quit
......@@ -17,6 +17,7 @@ clean:
uninstall: clean
# generate executable for import calls tools:
ImportCalls: ImportCalls.curry $(METADIR)/FlatCurry.curry \
ImportCalls: ImportCalls.curry $(LIBDIR)/FlatCurry/Types.curry \
$(LIBDIR)/FlatCurry/Files.curry \
$(LIBDIR)/System.curry $(LIBDIR)/List.curry
$(REPL) $(REPL_OPTS) :load ImportCalls :save :quit
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment