reorg tree (PMC)

.gitignore

@@ -16,22 +16,22 @@ installable_luap
 *.sto
 man
 
+dynext/*.dll
+dynext/*.so
+dynext/pmc/*.bundle
+dynext/pmc/*.c
+dynext/pmc/*.dump
+dynext/pmc/*.h
+dynext/pmc/*.o
+dynext/pmc/*.obj
+dynext/pmc/*.pdb
+
 lua/library/gl.pir
 lua/library/sha1.pir
 
 src/*_gen.pir
 src/lib/luabytecode_gen.pir
 
-src/pmc/*.bundle
-src/pmc/*.c
-src/pmc/*.dll
-src/pmc/*.dump
-src/pmc/*.h
-src/pmc/*.o
-src/pmc/*.obj
-src/pmc/*.pdb
-src/pmc/*.so
-
 t/*.lua
 t/*.luac
 t/*.orig_out

Configure.pir

@@ -20,7 +20,7 @@
     # Here, do the job
     push_eh _handler
     genfile('Makefile.in', 'Makefile', config)
-    genfile('src/pmc/Makefile.in', 'src/pmc/Makefile', config)
+    genfile('dynext/pmc/Makefile.in', 'dynext/pmc/Makefile', config)
     genfile('lua/library/Makefile.in', 'lua/library/Makefile', config)
     pop_eh
 

Makefile.in

@@ -16,7 +16,7 @@ LOAD_EXT      := @load_ext@
 O             := @o@
 
 # Various paths
-PMC_DIR       := src/pmc
+PMC_DIR       := dynext/pmc
 LUALIB_DIR    := lua/library
 LIBPATH       := src/lib
 
@@ -319,11 +319,11 @@ smolder : staging
 
 codetest: codetest-c codetest-make codetest-perl codetest-pir codetest-pod
 
-T_C     = src//pmc//*.pmc src//pmc//lua_private.h
-T_MAKE  = Makefile.in src//pmc//Makefile.in
+T_C     = dynext//pmc//*.pmc dynext//pmc//lua_private.h
+T_MAKE  = Makefile.in dynext//pmc//Makefile.in lua//library//Makefile.in
 T_PERL  = Configure.pl t//harness t//*.t t//Parrot//Test//*.pm \
           src//build//*.pl src//yapp//Lua//*.pm
-T_PIR   = *.pir src//lua51.pir src//grammar51.pir src//lib//*.pir t//pmc//*.t
+T_PIR   = *.pir src//lua51.pir src//grammar51.pir src//lib//*.pir lua//library//*.pir t//pmc//*.t
 T_POD   = doc//*.pod
 
 codetest-c:

src/pmc/Makefile.in → dynext/pmc/Makefile.in

@@ -7,9 +7,7 @@ INCLUDE_DIR   := @includedir@$(VERSION_DIR)
 LIB_DIR       := @libdir@$(VERSION_DIR)
 SRC_DIR       := @srcdir@$(VERSION_DIR)
 TOOLS_DIR     := @libdir@$(VERSION_DIR)/tools/lib
-STAGING_DIR   := ../../dynext
-#INSTALL_DIR   := $(LIB_DIR)/languages/lua/dynext
-INSTALL_DIR   := $(LIB_DIR)/dynext
+INSTALL_DIR   := $(LIB_DIR)/languages/lua/dynext
 
 # Set up extensions
 LOAD_EXT      := @load_ext@
@@ -18,7 +16,7 @@ O             := @o@
 # Setup some commands
 PERL          := @perl@
 RM_F          := @rm_f@
-MKPATH  := @mkpath@
+MKPATH        := @mkpath@
 CHMOD         := @chmod@
 CP            := @cp@
 CC            := @cc@ -c
@@ -84,7 +82,7 @@ CLEANUPS := \
   $(STAGING_DIR)/$(LUA_GROUP)$(LOAD_EXT)
 
 
-all: staging install
+all: linklibs
 
 generate: $(PMC_SOURCES)
 	$(PMC2CD) lua.pmc
@@ -126,16 +124,12 @@ compile: generate
 	$(CC) $(CC_OUT) lib-$(LUA_GROUP)$(O) $(INCLUDES) $(CFLAGS) $(LUA_GROUP).c
 
 linklibs: compile
-	$(LD) $(LD_OUT)$(LUA_GROUP)$(LOAD_EXT) $(OBJS) $(LINKARGS)
-
-staging: linklibs
-#IF(cygwin or hpux):	CHMOD 0775 "*$(LOAD_EXT)"
-	$(CP) "*$(LOAD_EXT)" $(STAGING_DIR)
+	$(LD) $(LD_OUT)../$(LUA_GROUP)$(LOAD_EXT) $(OBJS) $(LINKARGS)
 
 install:
 	$(MKPATH) $(INSTALL_DIR)
-#IF(cygwin or hpux):	CHMOD 0775 "*$(LOAD_EXT)"
-	$(CP) "*$(LOAD_EXT)" $(INSTALL_DIR)
+#IF(cygwin or hpux):	CHMOD 0775 "../*$(LOAD_EXT)"
+	$(CP) "../*$(LOAD_EXT)" $(INSTALL_DIR)
 
 uninstall:
 	$(RM_F) $(INSTALL_DIR)/$(LUA_GROUP)$(LOAD_EXT)