From 0ffa958fc4897ca167cfbba64c723590b9072cd0 Mon Sep 17 00:00:00 2001
From: Anthony Minessale II <anthmct@yahoo.com>
Date: Wed, 25 Aug 2004 02:41:38 +0000
Subject: some small changes to astxs utility

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 contrib/scripts/astxs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'contrib')

diff --git a/contrib/scripts/astxs b/contrib/scripts/astxs
index 36cdad350..42c143ee9 100755
--- a/contrib/scripts/astxs
+++ b/contrib/scripts/astxs
@@ -117,19 +117,31 @@ if($cfile =~ /http:\/\/.*?\/([^\/]+)$/) {
 
 
 if($cfile) {
-  ($base,$ext) = $cfile =~ /^([^\.]+)\.(.)/;
+  ($base,$ext) = $cfile =~ /^([^\.]+)\.(.+)/;
 }
 
-if($ext ne "c") {
+if($ext eq "so") {
+  unless($args{linkonly}) {
+    $args{installonly}++;
+  }
+} elsif($ext ne "c") {
   usage "Bad Input File";
 }
 
+
 my $bad=0;
 
-$bad = esystem("$vars{CC} $vars{CFLAGS} -c ${base}.c -o ${base}.o");
-$bad = esystem("$vars{CC} $vars{SOLINK} -o $vars{LDFLAGS} ${base}.so $base.o $vars{EXTOBJ}") if(!$bad);
+$bad = esystem("$vars{CC} $vars{CFLAGS} -c ${base}.c -o ${base}.o") unless($args{linkonly} or $args{installonly});
+exit -1 if($bad);
+exit if($args{nolink});
+
+
+
+$vars{MAINOBJ} ||= $base.o;
+$bad = esystem("$vars{CC} $vars{SOLINK} -o $vars{LDFLAGS} ${base}.so $vars{MAINOBJ} $vars{EXTOBJ}") if(!$bad and !$args{installonly});
+exit -1 if($bad);
 
-if($args{install} and $vars{MODULES_DIR}) {
+if(($args{install} or $args{installonly}) and $vars{MODULES_DIR}) {
   my $file = "${base}.so";
   my ($mod) = $file =~ /([^\/]*)$/;
 
-- 
cgit v1.2.3