[svn:mod_parrot] r212 - in mod_parrot/branches/reorg: . include src t/conf t/src

Author: ianjoyce
Date: Sun Aug 21 10:32:12 2005
New Revision: 212

Added:
   mod_parrot/branches/reorg/include/
   mod_parrot/branches/reorg/include/mod_parrot.h
      - copied unchanged from r211, mod_parrot/branches/reorg/mod_parrot.h
   mod_parrot/branches/reorg/include/modparrot_config.h
      - copied unchanged from r211, mod_parrot/branches/reorg/modparrot_config.h
   mod_parrot/branches/reorg/include/modparrot_log.h
      - copied unchanged from r211, mod_parrot/branches/reorg/modparrot_log.h
   mod_parrot/branches/reorg/src/
   mod_parrot/branches/reorg/src/context.c
      - copied unchanged from r211, mod_parrot/branches/reorg/context.c
   mod_parrot/branches/reorg/src/mod_parrot.c
      - copied unchanged from r211, mod_parrot/branches/reorg/mod_parrot.c
   mod_parrot/branches/reorg/src/modparrot_config.c
      - copied unchanged from r211, mod_parrot/branches/reorg/modparrot_config.c
   mod_parrot/branches/reorg/src/nci.c
      - copied, changed from r211, mod_parrot/branches/reorg/nci.c
   mod_parrot/branches/reorg/src/parrot_util.c
      - copied unchanged from r211, mod_parrot/branches/reorg/parrot_util.c
   mod_parrot/branches/reorg/t/src/
   mod_parrot/branches/reorg/t/src/cc_test.pir
      - copied unchanged from r211, mod_parrot/branches/reorg/cc_test.pir
   mod_parrot/branches/reorg/t/src/nci_sig_test.c
      - copied unchanged from r211, mod_parrot/branches/reorg/nci_sig_test.c
Removed:
   mod_parrot/branches/reorg/cc_test.pir
   mod_parrot/branches/reorg/context.c
   mod_parrot/branches/reorg/mod_parrot.c
   mod_parrot/branches/reorg/mod_parrot.h
   mod_parrot/branches/reorg/modparrot_config.c
   mod_parrot/branches/reorg/modparrot_config.h
   mod_parrot/branches/reorg/modparrot_log.h
   mod_parrot/branches/reorg/nci.c
   mod_parrot/branches/reorg/nci_sig_test.c
   mod_parrot/branches/reorg/parrot_util.c
Modified:
   mod_parrot/branches/reorg/Configure.pl
   mod_parrot/branches/reorg/Makefile.in
   mod_parrot/branches/reorg/t/conf/extra.conf.in
Log:
reorganized source into src/ include/ and t/src

Modified: mod_parrot/branches/reorg/Configure.pl
==============================================================================
--- mod_parrot/branches/reorg/Configure.pl	(original)
+++ mod_parrot/branches/reorg/Configure.pl	Sun Aug 21 10:32:12 2005
@@ -52,7 +52,7 @@ print "\n";
 
 my $defines;
 print "Determining Parrot calling conventions...";
-my $calling_conventions = `$parrot_build_dir/parrot cc_test.pir`;
+my $calling_conventions = `$parrot_build_dir/parrot t/src/cc_test.pir`;
 chomp($calling_conventions);
 if ($calling_conventions eq 'new') {
     $defines = '-DPARROT_NEW_CALL_CONV';
@@ -73,7 +73,7 @@ chomp($mpm);
 print "Configuring mod_parrot for $mpm MPM.\n";
 
 # we can't use the config verbatim -- apxs chokes on it, so we use what we can
-my $cflags = " -I$parrot_build_dir/include";
+my $cflags = " -I$parrot_build_dir/include -Iinclude";
 $cflags .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
 my $ldflags = parrot_config('ldflags') . " -L$parrot_build_dir/blib/lib";
 my $libs = parrot_config('libs') . ' -lparrot';

Modified: mod_parrot/branches/reorg/Makefile.in
==============================================================================
--- mod_parrot/branches/reorg/Makefile.in	(original)
+++ mod_parrot/branches/reorg/Makefile.in	Sun Aug 21 10:32:12 2005
@@ -13,8 +13,18 @@ PARROT=@PARROT@
 APACHE_INCLUDE_DIR=@APACHE_INCLUDE_DIR@
 CALLING_CONVENTIONS=@CALLING_CONVENTIONS@
 
-SOURCE_FILES=mod_parrot.c parrot_util.c modparrot_config.c nci.c context.c
+SRC_DIR = src
+TEST_SRC_DIR = t/src
+
+SOURCE_FILES= \
+	$(SRC_DIR)/mod_parrot.c \
+	$(SRC_DIR)/parrot_util.c \
+	$(SRC_DIR)/modparrot_config.c \
+	$(SRC_DIR)/nci.c \
+	$(SRC_DIR)/context.c
+
 PARROT_OBJS=$(PARROT_SOURCE)/src/parrot_config.o
+
 MPLIBS=	lib/Apache/RequestRec \
 	lib/Apache/Constants \
 	lib/APR/Table \
@@ -25,12 +35,12 @@ MPLIBS=	lib/Apache/RequestRec \
 all: gen-src mod_parrot.la
 
 mod_parrot.la: $(SOURCE_FILES)
-	$(APXS) -c $(DEFINES) $(CFLAGS) $(LDFLAGS) $(LIBS) $(SOURCE_FILES) $(PARROT_OBJS)
+	$(APXS) -c $(DEFINES) $(CFLAGS) $(LDFLAGS) $(LIBS) $(SOURCE_FILES) $(PARROT_OBJS) -Linclude
 
 files-clean:
-	rm -f *.o *.lo *.slo *.la core core.*
-	rm -rf .libs
-	rm -f nci_sig_test
+	rm -f $(SRC_DIR)/*.o $(SRC_DIR)/*.lo $(SRC_DIR)/*.slo $(SRC_DIR)/*.la core core.*
+	rm -rf $(SRC_DIR)/.libs
+	rm -f $(TEST_SRC_DIR)/nci_sig_test $(TEST_SRC_DIR)/*.o
 
 libraries:
 	@echo Compiling libraries:
@@ -65,8 +75,8 @@ distclean: clean test-clean
 install: mod_parrot.la
 	$(APXS) -i -n parrot -a mod_parrot.la
 
-nci_sig_test: nci_sig_test.o
-	$(CC) -o $@ $(CFLAGS) nci_sig_test.c $(PARROT_OBJS) $(LDFLAGS) $(LIBS)
+nci_sig_test: $(TEST_SRC_DIR)/nci_sig_test.o
+	$(CC) -o $@ $(CFLAGS) $(TEST_SRC_DIR)/nci_sig_test.c $(PARROT_OBJS) $(LDFLAGS) $(LIBS)
 
 test: mod_parrot.la libraries nci_sig_test
 	$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir

Copied: mod_parrot/branches/reorg/src/nci.c (from r211, mod_parrot/branches/reorg/nci.c)
==============================================================================
--- mod_parrot/branches/reorg/nci.c	(original)
+++ mod_parrot/branches/reorg/src/nci.c	Sun Aug 21 10:32:12 2005
@@ -30,7 +30,7 @@
 
 #include "mod_parrot.h"
 
-#include "build/src/nci/request_rec.c"
+#include "../build/src/nci/request_rec.c"
 
 request_rec *mpnci_request_rec(Parrot_Interp interp)
 {

Modified: mod_parrot/branches/reorg/t/conf/extra.conf.in
==============================================================================
--- mod_parrot/branches/reorg/t/conf/extra.conf.in	(original)
+++ mod_parrot/branches/reorg/t/conf/extra.conf.in	Sun Aug 21 10:32:12 2005
@@ -1,5 +1,5 @@
 <IfModule !mod_parrot.c>
-    LoadModule parrot_module @ServerRoot@/../.libs/mod_parrot.so
+    LoadModule parrot_module @ServerRoot@/../src/.libs/mod_parrot.so
 </IfModule>
 
 ParrotInit @ServerRoot@/../lib/ModParrot/init.pbc