[ros-diffs] [gedmurphy] 45203: Fix more makefile paths, rbuild now builds

Author: gedmurphy
Date: Fri Jan 22 17:32:15 2010
New Revision: 45203

URL: http://svn.reactos.org/svn/reactos?rev=45203&view=rev
Log:
Fix more makefile paths, rbuild now builds

Modified:
    branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak
    branches/Tree-restructure-test/sdk/libs/lib.mak
    branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak

Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/…
==============================================================================
--- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Fri Jan 22
17:32:15 2010
@@ -32,7 +32,7 @@
 
 INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
   -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
-  -Iinclude/reactos -Iinclude $(HOST_CFLAGS)
+  -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS)
 
 $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
 	$(ECHO_HOSTAR)

Modified: branches/Tree-restructure-test/sdk/libs/lib.mak
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/…
==============================================================================
--- branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] Fri Jan 22 17:32:15 2010
@@ -1,4 +1,4 @@
-LIB_BASE = lib
+LIB_BASE = sdk\libs
 LIB_BASE_ = $(LIB_BASE)$(SEP)
 
 include sdk/libs/inflib/inflib.mak

Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools…
==============================================================================
--- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Fri Jan 22
17:32:15 2010
@@ -321,7 +321,7 @@
 	$(RBUILD_COMMON_OBJECTS) \
 	$(RBUILD_TEST_SPECIAL_OBJECTS)
 
-RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE)
$(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos
+RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE)
$(TOOLS_CPPFLAGS) -Iinclude -Isdk/include/reactos
 
 RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)