Tweaks to ensure derived files all build correctly.

runrevmark · runrevmark · commit 41ff5b389bd9 · 2013-04-17T14:07:30.000+01:00
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ kernel-standalone: kernel
 kernel-development: kernel
 	$(MAKE) -C ./engine -f Makefile.kernel-development libkernel-development
 
-kernel-server: kernel
+kernel-server:
 	$(MAKE) -C ./engine -f Makefile.kernel-server libkernel-server
 
 development: libz libgif libjpeg libpcre libpng libopenssl libexternal libcore kernel kernel-development
diff --git a/engine/Makefile.kernel b/engine/Makefile.kernel
@@ -48,4 +48,9 @@ SOURCES=\
 linuxstubs.cpp: src/linux.stubs
 	../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp
 
+include/revbuild.h: include/revbuild.h.in
+	../prebuilt/bin/Revolution.lnx "./encode_version.rev" "./"
+
+../_cache/linux/$(MODE)/$(NAME)/mcstring.o: include/revbuild.h
+
 include Makefile.kernel-common
diff --git a/engine/Makefile.kernel-development b/engine/Makefile.kernel-development
@@ -3,19 +3,19 @@ TYPE=archive
 
 SOURCES= \
 	ide.cpp internal_development.cpp lextable.cpp mode_development.cpp \
-	startupstack.cpp deploy.cpp deploy_linux.cpp deploy_windows.cpp \
+	deploy.cpp deploy_linux.cpp deploy_windows.cpp \
 	deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
 	deploy_dmg.cpp bsdiff_build.cpp encodederrors.cpp
 
 KERNEL_DEFINES=\
 	MODE_DEVELOPMENT
 
-hashedstrings.cpp: src/lextable.cpp
+src/hashedstrings.cpp: src/lextable.cpp
 	../prebuilt/bin/Revolution.lnx "./hash_strings.rev" "./src/lextable.cpp" "./src/hashedstrings.cpp" "../prebuilt/bin/perfect.lnx"
 
 encodederrors.cpp: src/executionerrors.h src/parseerrors.h
 	../prebuilt/bin/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
 
-libkernel-development: hashedstrings.cpp
+../_cache/linux/$(MODE)/$(NAME)/ide.o: src/hashedstrings.cpp
 
 include Makefile.kernel-common
diff --git a/engine/Makefile.kernel-server b/engine/Makefile.kernel-server
@@ -52,10 +52,15 @@ CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
 	-fmessage-length=0 
 
+include/revbuild.h: include/revbuild.h.in
+	../prebuilt/bin/Revolution.lnx "./encode_version.rev" "./"
+
 linuxstubs.cpp: src/linux.stubs
-	../tools/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
+	../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.rev" <./src/linux.stubs >./src/linuxstubs.cpp
 
 encodederrors.cpp: src/executionerrors.h src/parseerrors.h
-	../tools/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
+	../prebuilt/bin/Revolution.lnx "./encode_errors.rev"  "./src" "./src/encodederrors.cpp"
+
+../_cache/linux/$(MODE)/$(NAME)/mcstring.o: include/revbuild.h
 
 include ../rules/archive.linux.makefile
diff --git a/rules/archive.linux.makefile b/rules/archive.linux.makefile
@@ -18,3 +18,4 @@ $(TARGET_PATH): $(OBJECTS) $(DEPS)
 
 .PHONY: $(NAME)
 $(NAME): $(TARGET_PATH)
+	#
diff --git a/rules/common.linux.makefile b/rules/common.linux.makefile
@@ -36,7 +36,7 @@ GLOBAL_INCLUDES=\
 	$(SOLUTION_DIR)/thirdparty/libzip/include \
 	$(SOLUTION_DIR)/thirdparty/libopenssl/include \
 	$(SOLUTION_DIR)/thirdparty/libcurl/include 
-	
+
 GLOBAL_LIBS=\
 	$(SOLUTION_DIR)/prebuilt/lib
 

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,4 @@ $(TARGET_PATH): $(OBJECTS) $(DEPS)`
`18`	`18`
`19`	`19`	`.PHONY: $(NAME)`
`20`	`20`	`$(NAME): $(TARGET_PATH)`
	`21`	`+ #`