Index: trunk/psLib/swig/Makefile.am
===================================================================
--- trunk/psLib/swig/Makefile.am	(revision 3123)
+++ trunk/psLib/swig/Makefile.am	(revision 3127)
@@ -1,34 +1,49 @@
 
-EXTRA_DIST = pslib.i psLibModule/Makefile.PL
+EXTRA_DIST = pslib.i Makefile.PL 
 
-CLEANFILES = psLibModule/pslib_wrap.c psLibModule/pslib.pm \
-psLibModule/Makefile psLibModule/pm_to_blib psLibModule/pslib.bs \
-psLibModule/pslib_wrap.o psLibModule/setup.txt
+clean-generic:
+	rm -rf psLibModule
 
-SRCDIR = $(shell cd $(top_srcdir)/src && pwd)
-
-INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/astronomy -I$(SRCDIR)/collections \
--I$(SRCDIR)/dataManip -I$(SRCDIR)/fileUtils -I$(SRCDIR)/image \
--I$(SRCDIR)/sysUtils
+INCLUDES = -I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/astronomy \
+	-I$(top_srcdir)/src/collections \
+	-I$(top_srcdir)/src/dataManip \
+	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/image \
+	-I$(top_srcdir)/src/sysUtils
 
 ####################################################
 ## PsLibModule swig build section.  
 
-psLibModule/setup.txt:Makefile
+psLibModule:
+	mkdir psLibModule
+
+psLibModule/Makefile.PL: psLibModule
+	cp $(srcdir)/Makefile.PL psLibModule/Makefile.PL
+
+psLibModule/setup.txt:psLibModule Makefile
 	echo "includes=$(INCLUDES)" > psLibModule/setup.txt
-	echo "ldflags=$(PSLIB_LIBS)" >> psLibModule/setup.txt
+	echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
 	echo "cflags=$(PSLIB_CFLAGS) -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
 
-psLibModule/pslib_wrap.c: pslib.i
-	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $?
+psLibModule/pslib_wrap.c: psLibModule pslib.i
+	echo Source directory = $(top_srcdir)
+	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $(srcdir)/pslib.i 
 
-psLibModule/Makefile:psLibModule/Makefile.PL psLibModule/setup.txt
+psLibModule/Makefile:psLibModule psLibModule/Makefile.PL psLibModule/setup.txt
 	cd psLibModule && $(PERL) Makefile.PL PREFIX=$(PERL_PREFIX)
 
-all:psLibModule/pslib_wrap.c psLibModule/Makefile
+all: psLibModule psLibModule/pslib_wrap.c psLibModule/Makefile.PL
+
+swig: all psLibModule/Makefile
 	cd psLibModule && make
 
-install-exec-hook: all
+swig-check: swig
+	export PERLLIB=psLibModule && perl -Mpslib -e 'print "pslib version = " . pslib::psLibVersion() . "\n";'
+
+swig-install: swig
 	cd psLibModule && make install
+
+install-exec-hook: swig-install
 
 uninstall-local: psLibModule/Makefile