Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

library installation directory changed

  • Loading branch information...
commit 6f2da74c48952681fc335c46ad365e5a604a7d6e 1 parent 28c9c2d
@nishiuramakoto authored
View
3  .gitignore
@@ -5,7 +5,6 @@
NUL
Makefile
Makefile.in
-aclocal.m4
autom4te.cache/
config.log
config.status
@@ -13,7 +12,7 @@ configure
erasm-0.1.tar.gz
erasm-0.1/
libtool
-m4/
src/.deps/
src/.libs/
distcheck.log
+tmp/
View
14 INSTALL
@@ -32,7 +32,7 @@ REQUIREMENTS
ERASM++ requires:
-* GNU Autotools
+* GNU make
* Boost static assert
* Boost stdint
(ERASM++ assumes the availability of int8_t,int16_t,int32_t,int64_t and
@@ -42,20 +42,18 @@ ERASM++ requires:
Check out http://www.boost.org and install above libraries.
Additionally, we use "#pragma pack" for struct packing.If your compiler
-doesn't support this,please let us know.
+doesn't support this,please let me know.
Furthermore,the following additional requirements must be met in order to
pass 'make check':
* GoogleTest
-* libopcodes (bundled with binutils)
-* GHC >= 7.0.3
+* libopcodes (bundled with GNU binutils)
+* GHC (Glasgow Haskell Compiler) >= 7.0.3
+* cabal
* parsec,uulib,HUnit,QuickCheck >=2.4,HaskellForMaths >=0.4.0,fgl
all of which are available through 'cabal install'.
-(In order to ensure maximum cross-compiler portability,should we switch to
-other build systems? like cmake? boost's?)
-
INSTALLATION
------------
@@ -66,7 +64,7 @@ make
make install
This will install the necessary headers under PREFIX/include/erasm,
-and libraries under PREFIX/lib/erasm.
+and libraries under PREFIX/lib.
We don't recommend installing on the system directories,as ERASM++ is still
in its alpha stage.
View
2  README
@@ -10,7 +10,7 @@ of the library.
Contents
1. ERASM++
1.1 Overview
- 1.2 Basic Usage
+ 1.2 Basic Example
1.3 Syntax
1.4 Performance
1.5 Limitations
View
1  TODO
@@ -3,3 +3,4 @@ gas assembler source <-> rasm c code
cl (masm) source <-> rasm c code
integrate with Visual Studio
+Debug build vesion that compiles reasonably fast
View
4 src/Makefile.am
@@ -69,7 +69,7 @@ check_PROGRAMS = \
erasm_checker \
preprocess
-pkglib_LTLIBRARIES = liberasm64.la liberasm86.la
+lib_LTLIBRARIES = liberasm64.la liberasm86.la
check_LTLIBRARIES = liberasm64_test.la liberasm86_test.la libgnu_dsm.la
ERASM64_TEST_LDADD = liberasm64_test.la liberasm64.la
@@ -87,7 +87,7 @@ EXTRA_PROGRAMS = \
myghcpp meta_haskell \
test_gnudsm hook_test
-pkginclude_HEADERS = \
+nobase_include_HEADERS = \
erasm/dsm_x64.hpp \
erasm/dsm_x64_auto_stm.hpp \
erasm/dsm_x86.hpp \
View
109 src/Makefile.in
@@ -70,7 +70,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(dist_noinst_HEADERS) $(dist_noinst_SCRIPTS) \
- $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
+ $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/haskell/Makefile.am TODO
bin_PROGRAMS =
@@ -124,9 +124,9 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(pkgincludedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(includedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
liberasm64_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_liberasm64_la_OBJECTS = erasm/x64.lo erasm/x64_assembler_impl.lo \
@@ -384,7 +384,7 @@ DIST_SOURCES = $(liberasm64_la_SOURCES) $(liberasm64_test_la_SOURCES) \
$(x64_addr64_test_SOURCES) $(x64_assembler_test_64_32_SOURCES) \
$(x86_addr16_test_SOURCES) $(x86_addr32_test_SOURCES) \
$(x86_assembler_test_32_32_SOURCES)
-HEADERS = $(dist_noinst_HEADERS) $(pkginclude_HEADERS)
+HEADERS = $(dist_noinst_HEADERS) $(nobase_include_HEADERS)
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
@@ -610,11 +610,11 @@ TESTS_ALL = \
check_illegal_code_x86_32.sh \
check_illegal_code_x64.sh
-pkglib_LTLIBRARIES = liberasm64.la liberasm86.la
+lib_LTLIBRARIES = liberasm64.la liberasm86.la
check_LTLIBRARIES = liberasm64_test.la liberasm86_test.la libgnu_dsm.la
ERASM64_TEST_LDADD = liberasm64_test.la liberasm64.la
ERASM86_TEST_LDADD = liberasm86_test.la liberasm86.la
-pkginclude_HEADERS = \
+nobase_include_HEADERS = \
erasm/dsm_x64.hpp \
erasm/dsm_x64_auto_stm.hpp \
erasm/dsm_x86.hpp \
@@ -950,32 +950,32 @@ clean-checkLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
list2="$$list2 $$p"; \
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
-uninstall-pkglibLTLIBRARIES:
+uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
for p in $$list; do \
$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
@@ -995,7 +995,7 @@ erasm/x64_addr64_data32.lo: erasm/$(am__dirstamp) \
erasm/x64_instruction_definition.lo: erasm/$(am__dirstamp) \
erasm/$(DEPDIR)/$(am__dirstamp)
liberasm64.la: $(liberasm64_la_OBJECTS) $(liberasm64_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(pkglibdir) $(liberasm64_la_OBJECTS) $(liberasm64_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(liberasm64_la_OBJECTS) $(liberasm64_la_LIBADD) $(LIBS)
erasm/x64_assembler_test_code_64_32.lo: erasm/$(am__dirstamp) \
erasm/$(DEPDIR)/$(am__dirstamp)
liberasm64_test.la: $(liberasm64_test_la_OBJECTS) $(liberasm64_test_la_DEPENDENCIES)
@@ -1008,7 +1008,7 @@ erasm/x86_addr32_data32.lo: erasm/$(am__dirstamp) \
erasm/x86_instruction_definition.lo: erasm/$(am__dirstamp) \
erasm/$(DEPDIR)/$(am__dirstamp)
liberasm86.la: $(liberasm86_la_OBJECTS) $(liberasm86_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(pkglibdir) $(liberasm86_la_OBJECTS) $(liberasm86_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(liberasm86_la_OBJECTS) $(liberasm86_la_LIBADD) $(LIBS)
erasm/x86_assembler_test_code_32_32.lo: erasm/$(am__dirstamp) \
erasm/$(DEPDIR)/$(am__dirstamp)
liberasm86_test.la: $(liberasm86_test_la_OBJECTS) $(liberasm86_test_la_DEPENDENCIES)
@@ -1727,26 +1727,29 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-rm -rf erasm/.libs erasm/_libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+install-nobase_includeHEADERS: $(nobase_include_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
- @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ $(am__nobase_list) | while read dir files; do \
+ xfiles=; for file in $$files; do \
+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
+ echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
+ $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
done
-uninstall-pkgincludeHEADERS:
+uninstall-nobase_includeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1929,8 +1932,10 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) \
config.h
+install-binPROGRAMS: install-libLTLIBRARIES
+
installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -1966,7 +1971,7 @@ maintainer-clean-generic:
clean: clean-am
clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
- clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+ clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
@@ -1987,13 +1992,13 @@ info: info-am
info-am:
-install-data-am: install-pkgincludeHEADERS
+install-data-am: install-nobase_includeHEADERS
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
install-html: install-html-am
@@ -2033,28 +2038,28 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-pkgincludeHEADERS \
- uninstall-pkglibLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+ uninstall-nobase_includeHEADERS
.MAKE: all check check-am install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
- clean-generic clean-libtool clean-pkglibLTLIBRARIES ctags \
+ clean-generic clean-libLTLIBRARIES clean-libtool ctags \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-local distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgincludeHEADERS \
- install-pkglibLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-pkgincludeHEADERS \
- uninstall-pkglibLTLIBRARIES
+ install-html-am install-info install-info-am \
+ install-libLTLIBRARIES install-man \
+ install-nobase_includeHEADERS install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
haskell/ErasmTest.hs : haskell/GenErasmTest.hs \
Please sign in to comment.
Something went wrong with that request. Please try again.