Commit 65ca88b1 authored by vasseu_c's avatar vasseu_c
Browse files

Index: Makefile.am

--- Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/f/34_Makefile.a 1.4 640)
+++ Makefile.am Tue, 13 May 2003 02:31:08 +0200 vasseu_c (meta-c++-grammar/f/34_Makefile.a 1.4 640)
@@ -1,4 +1,4 @@
 SUBDIRS = config src lib test
 EXTRA_DIST = stdconfig bootstrap Makefile.xt
 include Makefile.xt
-XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
+XTC_IMPORT = $(STRATEGOXT)/share/xt-strategoxt/XTC
Index: stdconfig
--- stdconfig Tue, 25 Mar 2003 06:44:56 +0100 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
+++ stdconfig Tue, 06 May 2003 18:49:58 +0200 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
@@ -1,9 +1,7 @@
 #!/bin/sh

-XT_PREFIX=$HOME/xt
+XT=/usr

 ./bootstrap
-./configure --prefix=$HOME \
-            --with-xt=$XT_PREFIX \
-            --with-stratego-xt=$XT_PREFIX \
-            --with-xtc=$XT_PREFIX
+./configure --prefix=$HOME --with-xt=$XT \
+CFLAGS="-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm"
Index: src/pp/Makefile.am
--- src/pp/Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/g/48_Makefile.a 1.1 644)
+++ src/pp/Makefile.am Wed, 07 May 2003 01:30:41 +0200 vasseu_c (meta-c++-grammar/g/48_Makefile.a 1.1 644)
@@ -2,7 +2,7 @@

 bin_PROGRAMS   = pp-cpp
 SCFLAGS                = --main $*
-STRINCLUDES    = -I $(XTC)/share/xtc -I $(GPP)/share/gpp
+STRINCLUDES    = -I $(XTCFLAGS)
 pkgdata_DATA   = Cpp-pretty.pp.af
 EXTRA_DIST     = Cpp-pretty.pp pp-cpp.str unbox.str
 CLEANFILES     = Cpp-pretty.pp.af
parent 006ca3e9
2003-05-13 Clement Vasseur <vasseu_c@lrde.epita.fr>
* stdconfig: Adapt to the Debian xt-strategoxt package: the XT prefix
is /usr and CFLAGS are needed to locate the include files.
* Makefile.am: Change the StrategoXT path in XTC_IMPORT.
NOTE: temporary fix, not supposed to stay like that.
* src/pp/Makefile.am: Use $(XTCFLAGS) instead of $(XTC)/share/xtc, so
that Makefile.am does not depend on /share/xtc which is not the same
in the xt-strategoxt Debian package.
2003-04-10 Valentin David <david_v@lrde.epita.fr>
* Makefile.am: Added StrategoXT to the XTC_IMPORT.
......
SUBDIRS = config src lib test
EXTRA_DIST = stdconfig bootstrap Makefile.xt
include Makefile.xt
XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
XTC_IMPORT = $(STRATEGOXT)/share/xt-strategoxt/XTC
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Meta/SDF Grammar for C++")
(Project-Version meta-c++-grammar 0 103)
(Parent-Version meta-c++-grammar 0 102)
(Version-Log "2003-04-10 Valentin David <david_v@lrde.epita.fr>
(Project-Version meta-c++-grammar 0 104)
(Parent-Version meta-c++-grammar 0 103)
(Version-Log "Index: Makefile.am
--- Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/f/34_Makefile.a 1.4 640)
+++ Makefile.am Tue, 13 May 2003 02:31:08 +0200 vasseu_c (meta-c++-grammar/f/34_Makefile.a 1.4 640)
@@ -1,4 +1,4 @@
SUBDIRS = config src lib test
EXTRA_DIST = stdconfig bootstrap Makefile.xt
include Makefile.xt
-XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
+XTC_IMPORT = $(STRATEGOXT)/share/xt-strategoxt/XTC
Index: stdconfig
--- stdconfig Tue, 25 Mar 2003 06:44:56 +0100 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
+++ stdconfig Tue, 06 May 2003 18:49:58 +0200 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
@@ -1,9 +1,7 @@
#!/bin/sh
-XT_PREFIX=$HOME/xt
+XT=/usr
./bootstrap
-./configure --prefix=$HOME \\
- --with-xt=$XT_PREFIX \\
- --with-stratego-xt=$XT_PREFIX \\
- --with-xtc=$XT_PREFIX
+./configure --prefix=$HOME --with-xt=$XT \\
+CFLAGS=\"-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm\"
Index: src/pp/Makefile.am
--- src/pp/Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/g/48_Makefile.a 1.1 644)
+++ src/pp/Makefile.am Wed, 07 May 2003 01:30:41 +0200 vasseu_c (meta-c++-grammar/g/48_Makefile.a 1.1 644)
@@ -2,7 +2,7 @@
bin_PROGRAMS = pp-cpp
SCFLAGS = --main $*
-STRINCLUDES = -I $(XTC)/share/xtc -I $(GPP)/share/gpp
+STRINCLUDES = -I $(XTCFLAGS)
pkgdata_DATA = Cpp-pretty.pp.af
EXTRA_DIST = Cpp-pretty.pp pp-cpp.str unbox.str
CLEANFILES = Cpp-pretty.pp.af
* Makefile.am: Added StrategoXT to the XTC_IMPORT.
* configure.ac, src/Makefile: Update.
* src/pp: New Directory.
* src/pp/Makefile: New file.
* src/pp/pp-cpp.str: New file. Pretty printer.
* src/pp/unbox.str: New file. Tool for abox transformation.
* src/pp/Cpp-pretty.pp: New file. Pretty print table.
")
(New-Version-Log "")
(Checkin-Time "Thu, 10 Apr 2003 18:40:23 +0200")
(Checkin-Login david_v)
(Checkin-Time "Tue, 13 May 2003 04:23:36 +0200")
(Checkin-Login vasseu_c)
(Populate-Ignore
(
;; Temporary files.
......@@ -86,8 +115,8 @@
)
(Project-Keywords)
(Files
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.99 640))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.4 640))
(ChangeLog (meta-c++-grammar/0_ChangeLog 1.100 640))
(Makefile.am (meta-c++-grammar/f/34_Makefile.a 1.5 640))
(TODO (meta-c++-grammar/f/27_TODO 1.2 640))
(README (meta-c++-grammar/g/37_README 1.2 644))
......@@ -429,7 +458,7 @@
(src/cpp-to-det/Makefile.am (meta-c++-grammar/g/42_Makefile.a 1.3 644))
(src/cpp-to-det/cpp-to-det.str (meta-c++-grammar/g/43_Main.r 1.4 644))
(stdconfig (meta-c++-grammar/g/44_stdconfig 1.1 755))
(stdconfig (meta-c++-grammar/g/44_stdconfig 1.2 755))
(bootstrap (meta-c++-grammar/g/45_bootstrap 1.1 755))
;; Files added by populate at Thu, 10 Apr 2003 18:38:51 +0200,
......@@ -437,7 +466,7 @@
(src/pp/unbox.str (meta-c++-grammar/g/46_unbox.str 1.1 644))
(src/pp/pp-cpp.str (meta-c++-grammar/g/47_pp-cpp.str 1.1 644))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.1 644))
(src/pp/Makefile.am (meta-c++-grammar/g/48_Makefile.a 1.2 644))
(src/pp/Cpp-pretty.pp (meta-c++-grammar/g/49_Cpp-pretty 1.1 600))
)
(Merge-Parents)
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.xt
bin_PROGRAMS = pp-cpp
SCFLAGS = --main $*
STRINCLUDES = -I $(XTC)/share/xtc -I $(GPP)/share/gpp
STRINCLUDES = -I $(XTCFLAGS)
pkgdata_DATA = Cpp-pretty.pp.af
EXTRA_DIST = Cpp-pretty.pp pp-cpp.str unbox.str
CLEANFILES = Cpp-pretty.pp.af
......
#!/bin/sh
XT_PREFIX=$HOME/xt
XT=/usr
./bootstrap
./configure --prefix=$HOME \
--with-xt=$XT_PREFIX \
--with-stratego-xt=$XT_PREFIX \
--with-xtc=$XT_PREFIX
./configure --prefix=$HOME --with-xt=$XT \
CFLAGS="-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm"
Supports Markdown
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