# HG changeset patch # User thomask # Date 1097950361 0 # Node ID fca2783c3c8cb11141189810e8b498ca1ec27344 # Parent 6e5067190feaa7a888bdf4e132bf4f8fa135bdbc fixed private_import doubles diff -r 6e5067190fea -r fca2783c3c8c complex/private_import_01/a.d --- a/complex/private_import_01/a.d Sat Oct 16 18:11:24 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -module a; - -public int fooA; diff -r 6e5067190fea -r fca2783c3c8c complex/private_import_01/b.d --- a/complex/private_import_01/b.d Sat Oct 16 18:11:24 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -module b; - -private import a; - -int fooB = fooA + 3; diff -r 6e5067190fea -r fca2783c3c8c complex/private_import_01/c.d --- a/complex/private_import_01/c.d Sat Oct 16 18:11:24 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -module c; - -import b; - -int fooC = fooA; diff -r 6e5067190fea -r fca2783c3c8c complex/private_import_01/complex.mak --- a/complex/private_import_01/complex.mak Sat Oct 16 18:11:24 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -# GnuMakefile for DStress http://dmd.kuehne.cn/dstress.html -# Copyright (C) 2004 Thomas Kuehne -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -.PHONY: \ - complex/private_import/warning \ - complex/private_import/$(complex_done) \ - complex/private_import/clean - -complex/private_import/warning : - @echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex\" or \"all\"" - -# the actual target, will be called by root's "all" / "complex" target -complex/private_import/$(complex_done) : complex/private_import/private_import_01.done complex/private_import/private_import_02.done - -# -# compile only the 3rd file -# -complex/private_import/private_import_01.done : complex/private_import/a.$(ext_source) complex/private_import/b.$(ext_source) complex/private_import/c.$(ext_source) complex/private_import/$(complex_todo) - $(eval z_name = $(subst .done,,$@)) - @if $(DMD) $(DFLAGS) -c -Icomplex/private_import/ -ofcomplex/private_import/c.$(ext_compile) complex/private_import/c.$(ext_source) $(to_log); then \ - $(ECHO) "XPASS: $(z_name)"; \ - else \ - $(ECHO) "FAIL: $(z_name)"; $(TOUCH) $@; \ - fi - -# -# compile all 3 files at the same time -# -complex/private_import/private_import_02.done : complex/private_import/a.$(ext_source) complex/private_import/b.$(ext_source) complex/private_import/c.$(ext_source) complex/private_import/$(complex_todo) - $(eval z_name = $(subst .done,,$@)) - @if $(DMD) $(DFLAGS) -c -od$(OBJ_DIR) complex/private_import/a.$(ext_source) complex/private_import/b.$(ext_source) complex/private_import/c.$(ext_source) $(to_log); then \ - $(ECHO) "XPASS: $(z_name)"; \ - else \ - $(ECHO) "FAIL: $(z_name)"; $(TOUCH) $@; \ - fi - - -# this will be called by root's "clean" target -complex/private_import/clean : - $(RM) complex/private_import/$(complex_done) complex/private_import/?*.$(ext_compile) complex/private_import/private_import_??.done -