Skip to content
Browse files

cleaning some

  • Loading branch information...
1 parent ec3a23a commit 52383a2c1107511a4e0800e1046ac21829be3db6 @blackrim committed Feb 15, 2012
Showing with 74 additions and 67 deletions.
  1. +15 −12 src/Makefile
  2. +15 −12 src/Makefile.in
  3. +12 −12 src/autom4te.cache/output.0
  4. +2 −2 src/autom4te.cache/requests
  5. +1 −1 src/autom4te.cache/traces.0
  6. +1 −1 src/config.h
  7. +9 −9 src/config.log
  8. +4 −4 src/config.status
  9. +12 −12 src/configure
  10. +1 −1 src/configure.ac
  11. +2 −1 src/main.cpp
View
27 src/Makefile
@@ -7,10 +7,17 @@
CC := gcc
CP := g++
+OPENMP := -fopenmp
+#OPENMP := -openmp -parallel
+
+LIBS := -lm $(OPENMP) -ladolc -L/usr/lib64 -lnlopt_cxx
+
RM := rm -rf
SRC_DIR = ./
+prefix = /usr/bin/
+
CPP_SRCS += \
./main.cpp \
./node.cpp \
@@ -60,27 +67,23 @@ CPP_DEPS += \
./optim_options.d \
./utils.d
-
-OPENMP := -fopenmp
-#OPENMP := -openmp -parallel
-
%.o: %.cpp
$(CP) -O3 -g3 -c -fmessage-length=0 $(OPENMP) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o $@ $(SRC_DIR)$<
%.o: %.c
$(CC) -O3 -g3 -c -fmessage-length=0 $(OPENMP) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o $@ $<
-LIBS := -lm $(OPENMP) -ladolc -L/usr/lib64 -lnlopt_cxx
-
-# All Target
-all: cppr8s
+all: treePL
-# Tool invocations
-cppr8s: $(OBJS)
- $(CP) -O3 -g3 -o cppr8s $(OBJS) $(LIBS)
+treePL: $(OBJS)
+ $(CP) -O3 -g3 -o treePL $(OBJS) $(LIBS)
-# Other Targets
clean:
-$(RM) *.d *.o
+install:
+ install -m 0755 treePL $(prefix)
+
+uninstall:
+ -rm $(prefix)/treePL
View
27 src/Makefile.in
@@ -7,10 +7,17 @@
CC := gcc
CP := g++
+OPENMP := -fopenmp
+#OPENMP := -openmp -parallel
+
+LIBS := -lm $(OPENMP) -ladolc -L/usr/lib64 -lnlopt_cxx
+
RM := rm -rf
SRC_DIR = ./
+prefix = /usr/bin/
+
CPP_SRCS += \
./main.cpp \
./node.cpp \
@@ -60,27 +67,23 @@ CPP_DEPS += \
./optim_options.d \
./utils.d
-
-OPENMP := -fopenmp
-#OPENMP := -openmp -parallel
-
%.o: %.cpp
$(CP) -O3 -g3 -c -fmessage-length=0 $(OPENMP) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o $@ $(SRC_DIR)$<
%.o: %.c
$(CC) -O3 -g3 -c -fmessage-length=0 $(OPENMP) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o $@ $<
-LIBS := -lm $(OPENMP) -ladolc -L/usr/lib64 -lnlopt_cxx
-
-# All Target
-all: cppr8s
+all: treePL
-# Tool invocations
-cppr8s: $(OBJS)
- $(CP) -O3 -g3 -o cppr8s $(OBJS) $(LIBS)
+treePL: $(OBJS)
+ $(CP) -O3 -g3 -o treePL $(OBJS) $(LIBS)
-# Other Targets
clean:
-$(RM) *.d *.o
+install:
+ install -m 0755 treePL $(prefix)
+
+uninstall:
+ -rm $(prefix)treePL
View
24 src/autom4te.cache/output.0
@@ -2,7 +2,7 @@
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.68 for treepl 0.1.
@%:@
-@%:@ Report bugs to <http://bitbucket.org/blackrim/clocking>.
+@%:@ Report bugs to <eebsmith@umich.edu>.
@%:@
@%:@
@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -238,11 +238,11 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: http://bitbucket.org/blackrim/clocking about your
-$0: system, including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and eebsmith@umich.edu
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
fi
exit 1
fi
@@ -562,7 +562,7 @@ PACKAGE_NAME='treepl'
PACKAGE_TARNAME='treepl'
PACKAGE_VERSION='0.1'
PACKAGE_STRING='treepl 0.1'
-PACKAGE_BUGREPORT='http://bitbucket.org/blackrim/clocking'
+PACKAGE_BUGREPORT='eebsmith@umich.edu'
PACKAGE_URL=''
ac_unique_file="tnc.h"
@@ -1294,7 +1294,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <http://bitbucket.org/blackrim/clocking>.
+Report bugs to <eebsmith@umich.edu>.
_ACEOF
ac_status=$?
fi
@@ -1600,9 +1600,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------------- ##
-## Report this to http://bitbucket.org/blackrim/clocking ##
-## ----------------------------------------------------- ##"
+( $as_echo "## --------------------------------- ##
+## Report this to eebsmith@umich.edu ##
+## --------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -4745,7 +4745,7 @@ $config_files
Configuration headers:
$config_headers
-Report bugs to <http://bitbucket.org/blackrim/clocking>."
+Report bugs to <eebsmith@umich.edu>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
View
4 src/autom4te.cache/requests
@@ -14,8 +14,8 @@
'configure.ac'
],
{
- '_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
@@ -76,9 +76,9 @@
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
'AM_PROG_CC_C_O' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AM_POT_TOOLS' => 1,
'm4_include' => 1,
View
2 src/autom4te.cache/traces.0
@@ -1,5 +1,5 @@
m4trace:configure.ac:4: -1- AC_PREREQ([2.68])
-m4trace:configure.ac:5: -1- AC_INIT([treepl], [0.1], [http://bitbucket.org/blackrim/clocking])
+m4trace:configure.ac:5: -1- AC_INIT([treepl], [0.1], [eebsmith@umich.edu])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
View
2 src/config.h
@@ -60,7 +60,7 @@
#define HAVE__BOOL 1
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+#define PACKAGE_BUGREPORT "eebsmith@umich.edu"
/* Define to the full name of this package. */
#define PACKAGE_NAME "treepl"
View
18 src/config.log
@@ -163,7 +163,7 @@ configure: failed program was:
| #define PACKAGE_TARNAME "treepl"
| #define PACKAGE_VERSION "0.1"
| #define PACKAGE_STRING "treepl 0.1"
-| #define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+| #define PACKAGE_BUGREPORT "eebsmith@umich.edu"
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
@@ -180,7 +180,7 @@ configure: failed program was:
| #define PACKAGE_TARNAME "treepl"
| #define PACKAGE_VERSION "0.1"
| #define PACKAGE_STRING "treepl 0.1"
-| #define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+| #define PACKAGE_BUGREPORT "eebsmith@umich.edu"
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
@@ -249,8 +249,8 @@ configure:3729: $? = 0
configure:3738: result: yes
configure:3751: checking for library containing nlopt_create
configure:3782: gcc -o conftest -g -O2 conftest.c -lm >&5
-/tmp/ccfsReCF.o: In function `main':
-/media/data/Dropbox/programming/cpp/dev_r8s/clocking/src/conftest.c:32: undefined reference to `nlopt_create'
+/tmp/ccBF3yeL.o: In function `main':
+/media/data/Dropbox/programming/cpp/treePL/src/conftest.c:32: undefined reference to `nlopt_create'
collect2: ld returned 1 exit status
configure:3782: $? = 1
configure: failed program was:
@@ -259,7 +259,7 @@ configure: failed program was:
| #define PACKAGE_TARNAME "treepl"
| #define PACKAGE_VERSION "0.1"
| #define PACKAGE_STRING "treepl 0.1"
-| #define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+| #define PACKAGE_BUGREPORT "eebsmith@umich.edu"
| #define PACKAGE_URL ""
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
@@ -323,7 +323,7 @@ configure: failed program was:
| #define PACKAGE_TARNAME "treepl"
| #define PACKAGE_VERSION "0.1"
| #define PACKAGE_STRING "treepl 0.1"
-| #define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+| #define PACKAGE_BUGREPORT "eebsmith@umich.edu"
| #define PACKAGE_URL ""
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
@@ -400,7 +400,7 @@ configure: failed program was:
| #define PACKAGE_TARNAME "treepl"
| #define PACKAGE_VERSION "0.1"
| #define PACKAGE_STRING "treepl 0.1"
-| #define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+| #define PACKAGE_BUGREPORT "eebsmith@umich.edu"
| #define PACKAGE_URL ""
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
@@ -600,7 +600,7 @@ LIBOBJS=''
LIBS='-lnlopt_cxx -lm '
LTLIBOBJS=''
OBJEXT='o'
-PACKAGE_BUGREPORT='http://bitbucket.org/blackrim/clocking'
+PACKAGE_BUGREPORT='eebsmith@umich.edu'
PACKAGE_NAME='treepl'
PACKAGE_STRING='treepl 0.1'
PACKAGE_TARNAME='treepl'
@@ -646,7 +646,7 @@ target_alias=''
#define PACKAGE_TARNAME "treepl"
#define PACKAGE_VERSION "0.1"
#define PACKAGE_STRING "treepl 0.1"
-#define PACKAGE_BUGREPORT "http://bitbucket.org/blackrim/clocking"
+#define PACKAGE_BUGREPORT "eebsmith@umich.edu"
#define PACKAGE_URL ""
#define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1
View
8 src/config.status
@@ -433,7 +433,7 @@ $config_files
Configuration headers:
$config_headers
-Report bugs to <http://bitbucket.org/blackrim/clocking>."
+Report bugs to <eebsmith@umich.edu>."
ac_cs_config=""
ac_cs_version="\
@@ -445,7 +445,7 @@ Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/media/data/Dropbox/programming/cpp/dev_r8s/clocking/src'
+ac_pwd='/media/data/Dropbox/programming/cpp/treePL/src'
srcdir='.'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
@@ -659,7 +659,7 @@ S["program_transform_name"]="s,x,x,"
S["prefix"]="/usr/local"
S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]=""
-S["PACKAGE_BUGREPORT"]="http://bitbucket.org/blackrim/clocking"
+S["PACKAGE_BUGREPORT"]="eebsmith@umich.edu"
S["PACKAGE_STRING"]="treepl 0.1"
S["PACKAGE_VERSION"]="0.1"
S["PACKAGE_TARNAME"]="treepl"
@@ -711,7 +711,7 @@ D["PACKAGE_NAME"]=" \"treepl\""
D["PACKAGE_TARNAME"]=" \"treepl\""
D["PACKAGE_VERSION"]=" \"0.1\""
D["PACKAGE_STRING"]=" \"treepl 0.1\""
-D["PACKAGE_BUGREPORT"]=" \"http://bitbucket.org/blackrim/clocking\""
+D["PACKAGE_BUGREPORT"]=" \"eebsmith@umich.edu\""
D["PACKAGE_URL"]=" \"\""
D["STDC_HEADERS"]=" 1"
D["HAVE_SYS_TYPES_H"]=" 1"
View
24 src/configure
@@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for treepl 0.1.
#
-# Report bugs to <http://bitbucket.org/blackrim/clocking>.
+# Report bugs to <eebsmith@umich.edu>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -238,11 +238,11 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: http://bitbucket.org/blackrim/clocking about your
-$0: system, including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and eebsmith@umich.edu
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
fi
exit 1
fi
@@ -562,7 +562,7 @@ PACKAGE_NAME='treepl'
PACKAGE_TARNAME='treepl'
PACKAGE_VERSION='0.1'
PACKAGE_STRING='treepl 0.1'
-PACKAGE_BUGREPORT='http://bitbucket.org/blackrim/clocking'
+PACKAGE_BUGREPORT='eebsmith@umich.edu'
PACKAGE_URL=''
ac_unique_file="tnc.h"
@@ -1294,7 +1294,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <http://bitbucket.org/blackrim/clocking>.
+Report bugs to <eebsmith@umich.edu>.
_ACEOF
ac_status=$?
fi
@@ -1600,9 +1600,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------------- ##
-## Report this to http://bitbucket.org/blackrim/clocking ##
-## ----------------------------------------------------- ##"
+( $as_echo "## --------------------------------- ##
+## Report this to eebsmith@umich.edu ##
+## --------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -4745,7 +4745,7 @@ $config_files
Configuration headers:
$config_headers
-Report bugs to <http://bitbucket.org/blackrim/clocking>."
+Report bugs to <eebsmith@umich.edu>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
View
2 src/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([treepl], [0.1], [http://bitbucket.org/blackrim/clocking])
+AC_INIT([treepl], [0.1], [eebsmith@umich.edu])
AC_CONFIG_SRCDIR([tnc.h])
AC_CONFIG_HEADERS([config.h])
View
3 src/main.cpp
@@ -43,8 +43,9 @@ int main(int argc,char* argv[]) {
retval = feraiseexcept( FE_ALL_EXCEPT );
bool setparams = false;
if(argc != 2){
+ cout << "treePL version 1.0"<< endl;
cout << "you need more arguments." << endl;
- cout << "usage: cppr8s configfile" << endl;
+ cout << "usage: treePL configfile" << endl;
exit(0);
}
string treefile;

0 comments on commit 52383a2

Please sign in to comment.
Something went wrong with that request. Please try again.