# HG changeset patch
# User thomask
# Date 1099337272 0
# Node ID 965162333cb5dc48db1d8f449bd3406433d849a1
# Parent  5a0c46ed4e4a042ca4c2d5298df635cf2e161062
simplified private_import (step 2/2)

diff -r 5a0c46ed4e4a -r 965162333cb5 complex/private_import/complex.mak
--- a/complex/private_import/complex.mak	Mon Nov 01 19:25:56 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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/private_import/complex.done\", \"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) basic_tools
-	$(eval z_name = $(subst .done,,$@))
-	$(eval z_return = $(shell $(return__) "$(DMD) $(DFLAGS) -c -Icomplex/private_import/ -ofcomplex/private_import/c.$(ext_compile) complex/private_import/c.$(ext_source) $(to_log)"))
-	$(analyse_nocompile)
-
-#
-# 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) basic_tools
-	$(eval z_name = $(subst .done,,$@))
-	$(eval z_return = $(shell $(return__) "$(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)"))
-	$(analyse_nocompile)
-
-
-# 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
-
diff -r 5a0c46ed4e4a -r 965162333cb5 nocompile/private_import_01.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nocompile/private_import_01.d	Mon Nov 01 19:27:52 2004 +0000
@@ -0,0 +1,8 @@
+module dstress.nocompile.private_import_01;
+
+import dstress.addon.private_import_B;
+
+int main(){
+	int fooC = fooA;
+	return 0;
+}
diff -r 5a0c46ed4e4a -r 965162333cb5 nocompile/private_import_02.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nocompile/private_import_02.d	Mon Nov 01 19:27:52 2004 +0000
@@ -0,0 +1,10 @@
+// __DSTRESS_DFLAGS__ -I.. addon/private_import_A.d addon/private_import_B.d
+
+module dstress.nocompile.private_import_02;
+
+import dstress.addon.private_import_B;
+
+int main(){
+	int fooC = fooA;
+	return 0;
+}
diff -r 5a0c46ed4e4a -r 965162333cb5 run/private_import_01.d
--- a/run/private_import_01.d	Mon Nov 01 19:25:56 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-module dstress.nocompile.private_import_01;
-
-import dstress.addon.private_import_B;
-
-int main(){
-	int fooC = fooA;
-	return 0;
-}
diff -r 5a0c46ed4e4a -r 965162333cb5 run/private_import_02.d
--- a/run/private_import_02.d	Mon Nov 01 19:25:56 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-// __DSTRESS_DFLAGS__ -I.. addon/private_import_A.d addon/private_import_B.d
-
-module dstress.nocompile.private_import_02;
-
-import dstress.addon.private_import_B;
-
-int main(){
-	int fooC = fooA;
-	return 0;
-}