Get rid of file name clashes on NMake

Author: nobu

common.mk

@@ -85,30 +85,30 @@ MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
 
 PRISM_BUILD_DIR = prism
 
-PRISM_OBJS    = ./prism/api_node.$(OBJEXT) \
-		./prism/api_pack.$(OBJEXT) \
-		./prism/diagnostic.$(OBJEXT) \
-		./prism/encoding.$(OBJEXT) \
-		./prism/extension.$(OBJEXT) \
-		./prism/node.$(OBJEXT) \
-		./prism/options.$(OBJEXT) \
-		./prism/pack.$(OBJEXT) \
-		./prism/prettyprint.$(OBJEXT) \
-		./prism/regexp.$(OBJEXT) \
-		./prism/serialize.$(OBJEXT) \
-		./prism/static_literals.$(OBJEXT) \
-		./prism/token_type.$(OBJEXT) \
-		./prism/util/pm_buffer.$(OBJEXT) \
-		./prism/util/pm_char.$(OBJEXT) \
-		./prism/util/pm_constant_pool.$(OBJEXT) \
-		./prism/util/pm_integer.$(OBJEXT) \
-		./prism/util/pm_list.$(OBJEXT) \
-		./prism/util/pm_memchr.$(OBJEXT) \
-		./prism/util/pm_newline_list.$(OBJEXT) \
-		./prism/util/pm_string.$(OBJEXT) \
-		./prism/util/pm_strncasecmp.$(OBJEXT) \
-		./prism/util/pm_strpbrk.$(OBJEXT) \
-		./prism/prism.$(OBJEXT) \
+PRISM_OBJS    = $(prismobjdir)/api_node.$(OBJEXT) \
+		$(prismobjdir)/api_pack.$(OBJEXT) \
+		$(prismobjdir)/diagnostic.$(OBJEXT) \
+		$(prismobjdir)/encoding.$(OBJEXT) \
+		$(prismobjdir)/extension.$(OBJEXT) \
+		$(prismobjdir)/node.$(OBJEXT) \
+		$(prismobjdir)/options.$(OBJEXT) \
+		$(prismobjdir)/pack.$(OBJEXT) \
+		$(prismobjdir)/prettyprint.$(OBJEXT) \
+		$(prismobjdir)/regexp.$(OBJEXT) \
+		$(prismobjdir)/serialize.$(OBJEXT) \
+		$(prismobjdir)/static_literals.$(OBJEXT) \
+		$(prismobjdir)/token_type.$(OBJEXT) \
+		$(prismobjdir)/util/pm_buffer.$(OBJEXT) \
+		$(prismobjdir)/util/pm_char.$(OBJEXT) \
+		$(prismobjdir)/util/pm_constant_pool.$(OBJEXT) \
+		$(prismobjdir)/util/pm_integer.$(OBJEXT) \
+		$(prismobjdir)/util/pm_list.$(OBJEXT) \
+		$(prismobjdir)/util/pm_memchr.$(OBJEXT) \
+		$(prismobjdir)/util/pm_newline_list.$(OBJEXT) \
+		$(prismobjdir)/util/pm_string.$(OBJEXT) \
+		$(prismobjdir)/util/pm_strncasecmp.$(OBJEXT) \
+		$(prismobjdir)/util/pm_strpbrk.$(OBJEXT) \
+		$(prismobjdir)/prism.$(OBJEXT) \
 		prism_init.$(OBJEXT)
 
 COMMONOBJS    = \

template/Makefile.in

@@ -20,6 +20,7 @@ srcdir = @srcdir@
 top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
 tooldir = $(srcdir)/tool
+prismobjdir = ./prism
 
 PLATFORM_DIR = @PLATFORM_DIR@
 

win32/Makefile.sub

@@ -12,6 +12,7 @@ TZ =				# skip timezone tests
 PWD = $(MAKEDIR)
 empty =
 tooldir = $(srcdir)/tool
+prismobjdir = prism
 
 !ifndef MFLAGS
 MFLAGS=-l
@@ -1358,28 +1359,28 @@ modular-gc-precheck:
 	$(ECHO) assembling $(<:\=/)
 	$(Q) $(AS) $(ASFLAGS) -o $@ $(<:\=/)
 
-{$(srcdir)/prism}.c.obj:
+{$(srcdir)/prism}.c{prism/}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/prism/enc}.c.obj:
+{$(srcdir)/prism/enc}.c{prism/enc}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/prism/util}.c.obj:
+{$(srcdir)/prism/util}.c{prism/util}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/enc/trans}.c.obj:
+{$(srcdir)/enc/trans}.c{enc/trans}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)/enc}.c.obj:
+{$(srcdir)/enc}.c{enc}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
 {$(srcdir)/missing}.c.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(win_srcdir)}.c.obj:
+{$(win_srcdir)}.c{win32}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
-{$(srcdir)}.c{}.obj:
+{$(srcdir)}.c{.}.obj:
 	$(ECHO) compiling $(<:\=/)
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
 .c.obj: