diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-07-04 13:27:22 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-07-04 13:27:22 +0000 |
| commit | 51d3ade165a967580f16b41ef3e00cde08c6ff09 (patch) | |
| tree | c6f87341936a42efc20abd442e2d5948620485bd /src | |
| parent | 5e58041cfdae9a5b0f84137bf4f08b14517d3c01 (diff) | |
Install compiled resource modules in source and binary installs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 15 | ||||
| -rw-r--r-- | src/Makefile.binary | 14 |
2 files changed, 25 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 607a5648c..0c89fd067 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,6 +24,9 @@ GRAMMAR_DIST_DIR=gf-grammars-$(GRAMMAR_PACKAGE_VERSION) MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION) +GF_LIB_DIR=$(GF_DATA_DIR)/lib + +GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present EMBED = GF/Embed/TemplateApp @@ -138,7 +141,7 @@ today: echo 'version = "'$(PACKAGE_VERSION)'"' >> GF/Today.hs echo '{-# NOINLINE libdir #-}' >> GF/Today.hs echo 'libdir :: String' >> GF/Today.hs - echo 'libdir = "'$(GF_DATA_DIR)/lib'"' >> GF/Today.hs + echo 'libdir = "'$(GF_LIB_DIR)'"' >> GF/Today.hs javac: $(JAVAC) $(JAVAFLAGS) -classpath $(GFEDITOR)/jargs-1.0.jar $(GFEDITOR)/de/uka/ilkd/key/ocl/gf/*.java @@ -235,6 +238,9 @@ binary-dist: $(INSTALL) -m 0644 ../README ../LICENSE $(BIN_DIST_DIR) $(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL $(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile + $(MAKE) -C ../lib $(GF_LIB_PACKAGES) + $(INSTALL) -d $(addprefix $(BIN_DIST_DIR)/lib/, $(GF_LIB_PACKAGES)) + (cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '../src/$(BIN_DIST_DIR)/lib/{}' ';') $(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR) rm -rf $(BIN_DIST_DIR) @@ -257,7 +263,7 @@ windows-msi: gf.wxs # Installation # -install: install-gf install-gfdoc install-editor +install: install-gf install-gfdoc install-lib install-editor install-gf: $(INSTALL) -d $(bindir) @@ -267,6 +273,11 @@ install-gfdoc: $(INSTALL) -d $(bindir) $(INSTALL) tools/$(GF_DOC_EXE) $(bindir) +install-lib: + $(INSTALL) -d $(GF_LIB_DIR) + $(INSTALL) -d $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)) + (cd ../lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '$(GF_LIB_DIR)/{}' ';') + install-editor: $(INSTALL) -d $(GF_DATA_DIR) $(INSTALL) jgf $(bindir) diff --git a/src/Makefile.binary b/src/Makefile.binary index d23ae9b61..53cd6135d 100644 --- a/src/Makefile.binary +++ b/src/Makefile.binary @@ -1,17 +1,27 @@ include config.mk GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION) +GF_LIB_DIR=$(GF_DATA_DIR)/lib + +GF_LIB_PACKAGES = alltenses mathematical multimodal prelude present + +.PHONY: install uninstall -.PHONY: install install: $(INSTALL) -d $(bindir) $(INSTALL) gf$(EXEEXT) gfdoc$(EXEEXT) jgf gfeditor $(bindir) $(INSTALL) -d $(GF_DATA_DIR) $(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR) $(INSTALL) -m 0644 gfeditor.jar $(GF_DATA_DIR) + $(INSTALL) -d $(GF_LIB_DIR) + $(INSTALL) -d $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)) + (cd lib && find $(GF_LIB_PACKAGES) -type f -name '*.gf?' -exec $(INSTALL) -m 0644 '{}' '$(GF_LIB_DIR)/{}' ';') uninstall: -rm -f $(bindir)/gf$(EXEEXT) $(bindir)/gfdoc$(EXEEXT) $(bindir)/jgf $(bindir)/gfeditor -rm -f $(GF_DATA_DIR)/gf-java.jar -rm -f $(GF_DATA_DIR)/gfeditor.jar - -rmdir $(GF_DATA_DIR)
\ No newline at end of file + -rm -f $(addsuffix /*.gf?, $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES))) + -rmdir $(addprefix $(GF_LIB_DIR)/, $(GF_LIB_PACKAGES)) + -rmdir $(GF_LIB_DIR) + -rmdir $(GF_DATA_DIR) |