[pure-lang-svn] SF.net SVN: pure-lang: [203] pure/trunk

[<ag...@us...>]

Revision: 203
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=203&view=rev
Author:   agraef
Date:     2008-06-13 02:34:55 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
Rename SHARED, eliminate LIBPURE variable.

Modified Paths:
--------------
    pure/trunk/Makefile.in
    pure/trunk/configure
    pure/trunk/configure.ac

Modified: pure/trunk/Makefile.in
===================================================================
--- pure/trunk/Makefile.in	2008-06-13 09:18:22 UTC (rev 202)
+++ pure/trunk/Makefile.in	2008-06-13 09:34:55 UTC (rev 203)
@@ -66,18 +66,17 @@
 
 libpure      = lib$(libpure_vers)$(DLL)
 libpurelnk   = lib$(libpure_base)$(DLL)
-LIBPURE      = -l$(libpure_vers)
 
 # Whether to build the Pure runtime library. If this is set to anything but
 # "yes", the interpreter is linked statically and no separate library is
 # produced. This is necessary on some systems where LLVM cannot be linked in
 # dynamically.
 
-SHARED = @SHARED@
+sharedlib = @sharedlib@
 
 # On some systems -fPIC is needed for code linked as a shared library.
 
-ifeq ($(SHARED), yes)
+ifeq ($(sharedlib), yes)
 PIC = @PIC@
 else
 PIC =
@@ -87,7 +86,7 @@
 # (when built), but on some systems we have to load additional dlls to resolve
 # some library functions.
 
-ifeq ($(SHARED), yes)
+ifeq ($(sharedlib), yes)
 AUXLIBS = -DLIBPURE='"$(libpure)"' @AUXLIBS@
 else
 AUXLIBS = @AUXLIBS@
@@ -114,9 +113,9 @@
 
 all: pure$(EXE)
 
-ifeq ($(SHARED), yes)
+ifeq ($(sharedlib), yes)
 pure$(EXE): pure.o $(libpure)
-	$(CXX) -o $@ $(LDFLAGS) pure.o -L. $(LIBPURE) $(LIBS)
+	$(CXX) -o $@ $(LDFLAGS) pure.o -L. -l$(libpure_vers) $(LIBS)
 else
 pure$(EXE): pure.o $(OBJECT)
 	$(CXX) -o $@ $(LDFLAGS) pure.o $(OBJECT) $(LLVM_LIBS) $(LIBS)
@@ -189,7 +188,7 @@
 install: pure$(EXE)
 	for x in $(addprefix $(DESTDIR), $(bindir) $(libdir)/pure $(man1dir)); do $(INSTALL) -d $$x; done
 	$(INSTALL) pure$(EXE) $(DESTDIR)$(bindir)/pure$(EXE)
-ifeq ($(SHARED), yes)
+ifeq ($(sharedlib), yes)
 	$(INSTALL) $(libpure) $(DESTDIR)$(libdir)/$(libpure)
 	ln -sf $(libdir)/$(libpure) $(DESTDIR)$(libdir)/$(libpurelnk)
 endif

Modified: pure/trunk/configure
===================================================================
--- pure/trunk/configure	2008-06-13 09:18:22 UTC (rev 202)
+++ pure/trunk/configure	2008-06-13 09:34:55 UTC (rev 203)
@@ -677,7 +677,7 @@
 CPP
 GREP
 EGREP
-SHARED
+sharedlib
 LIBICONV
 ALLOCA
 LIBOBJS
@@ -4292,11 +4292,11 @@
   esac
 fi
 
-SHARED=yes
+sharedlib=yes
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared; case "${enableval}" in
-    no)   LDFLAGS="$LDFLAGS $RDYNAMIC"; SHARED=no ;;
+    no)   LDFLAGS="$LDFLAGS $RDYNAMIC"; sharedlib=no ;;
   esac
 fi
 
@@ -6049,7 +6049,7 @@
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
-SHARED!$SHARED$ac_delim
+sharedlib!$sharedlib$ac_delim
 LIBICONV!$LIBICONV$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -6493,7 +6493,7 @@
   Installation prefix:  ${prefix}
   Compiler:             $CXX $CXXFLAGS $CPPFLAGS
   Linker:               $CXX $LDFLAGS $LIBS
-  Build libpure:        $SHARED
+  Build libpure:        $sharedlib
 
 Now run 'make' to build everything, and 'make install' to install this
 software on your system. To remove the installed software at a later
@@ -6506,7 +6506,7 @@
   Installation prefix:  ${prefix}
   Compiler:             $CXX $CXXFLAGS $CPPFLAGS
   Linker:               $CXX $LDFLAGS $LIBS
-  Build libpure:        $SHARED
+  Build libpure:        $sharedlib
 
 Now run 'make' to build everything, and 'make install' to install this
 software on your system. To remove the installed software at a later

Modified: pure/trunk/configure.ac
===================================================================
--- pure/trunk/configure.ac	2008-06-13 09:18:22 UTC (rev 202)
+++ pure/trunk/configure.ac	2008-06-13 09:34:55 UTC (rev 203)
@@ -51,13 +51,13 @@
   [case "${enableval}" in
     yes)  CPPFLAGS="-DDEBUG=2"; CXXFLAGS="-g" ;;
   esac])
-SHARED=yes
+sharedlib=yes
 AC_ARG_ENABLE(shared,
   [  --disable-shared        link the interpreter statically],
   [case "${enableval}" in
-    no)   LDFLAGS="$LDFLAGS $RDYNAMIC"; SHARED=no ;;
+    no)   LDFLAGS="$LDFLAGS $RDYNAMIC"; sharedlib=no ;;
   esac])
-AC_SUBST(SHARED)
+AC_SUBST(sharedlib)
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       enable compiler warnings (-Wall)],
   [case "${enableval}" in
@@ -91,7 +91,7 @@
   Installation prefix:  ${prefix}
   Compiler:             $CXX $CXXFLAGS $CPPFLAGS
   Linker:               $CXX $LDFLAGS $LIBS
-  Build libpure:        $SHARED
+  Build libpure:        $sharedlib
 
 Now run 'make' to build everything, and 'make install' to install this
 software on your system. To remove the installed software at a later


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.