From 13f4c5ca9a477ac9917af02e881cf4ebb40b0ce9 Mon Sep 17 00:00:00 2001 From: kevin Date: Mon, 29 Oct 2012 14:07:53 -0700 Subject: [PATCH] Initial commit --- .gitignore | 5 ++ Makefile.am | 50 ++++++++++++++++++++ build/clean.sh | 56 ++++++++++++++++++++++ build/linux/debug/build.sh | 20 ++++++++ build/linux/release/build.sh | 19 ++++++++ build/osx/debug/build.sh | 20 ++++++++ build/osx/release/build.sh | 19 ++++++++ configure.ac | 92 ++++++++++++++++++++++++++++++++++++ m4/os_64.m4 | 8 ++++ m4/os_type.m4 | 11 +++++ src/proj/main.c | 10 ++++ 11 files changed, 310 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile.am create mode 100755 build/clean.sh create mode 100755 build/linux/debug/build.sh create mode 100755 build/linux/release/build.sh create mode 100755 build/osx/debug/build.sh create mode 100755 build/osx/release/build.sh create mode 100644 configure.ac create mode 100644 m4/os_64.m4 create mode 100644 m4/os_type.m4 create mode 100644 src/proj/main.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cbb464c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# directories to ignore +libproj + +# Files to ignore +Makefile diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..6dea2a5 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,50 @@ +ACLOCAL_AMFLAGS = -I m4 # use custom macro's in ./m4 +lib_LTLIBRARIES = +bin_PROGRAMS = +include_HEADERS = + + + +# C compiler flags +# _GNU_SOURCE - turns on GNU specific extensions and gives correct prototype for double log2(double) +# -Wall turn on all warnings +# -Wno-multichar - turns off multi-character constant warnings from cmAudioFile.c + + + +AM_CPPFLAGS = -D _GNU_SOURCE -I.. +AM_CFLAGS = -Wno-multichar +AM_CXXFLAGS = +AM_LDFLAGS = + +# debug/release switches +if DEBUG + AM_CFLAGS += -g + AM_CXXFLAGS += -g +else + AM_CFLAGS += -O3 + AM_CXXFLAGS += -O3 +endif + +# Linux specific +if OS_LINUX + +if OS_64 + AM_CFLAGS += -m64 +endif +endif + + + +include src/libproj/Makefile.am + + +src_libproj_libproj_la_SOURCES = $(libprojSRC) $(libprojHDR) +lib_LTLIBRARIES += src/libproj/libproj.la +include_HEADERS += $(libprojHDR) + + +src_proj_proj_SOURCES = src/proj/main.c +src_proj_proj_LDADD = src/libproj/libproj.la # autoconfig manual recommends setting direct referenes to non-3rd party libraries rather than using -L and -l +src_proj_proj_CPPFLAGS = -I$(srcdir)/src/libproj $(AM_CPPFLAGS) +bin_PROGRAMS += src/proj/proj diff --git a/build/clean.sh b/build/clean.sh new file mode 100755 index 0000000..a201a37 --- /dev/null +++ b/build/clean.sh @@ -0,0 +1,56 @@ +#!/bin/bash +# +# Run 'make distclean' to clean many of the temporary make files. +# then use this script run from cm/build to clean the remaining files +# + + + +function clean_dir { + +rm -f $1/bin/kc.app/Contents/MacOS/kc +rm -rf $1/src +rm -rf $1/cm +rm -rf $1/include +rm -rf $1/lib +rm -rf $1/bin +rm -rf $1/.deps + +rm -f $1/config.h +rm -f $1/config.log +rm -f $1/config.status +rm -f $1/Makefile +rm -f $1/stamp-h1 +rm -f $1/libtool + +make -C $1 distclean + +} + + +rm -f ../aclocal.m4 +rm -f ../config.h.in +rm -f ../configure +rm -f ../Makefile.in +rm -f ../src/Makefile.in +rm -rf ../autom4te.cache +rm -rf ../build-aux +rm -rf ../m4/libtool.m4 +rm -rf ../m4/lt* +rm -rf ../m4/.svn + +clean_dir linux/debug +clean_dir linux/release +clean_dir osx/debug +clean_dir osx/release + +rm -rf osx/debug/a.out.dSYM + + +#rm -rf ../octave/results + +# remove all of emacs backup files (files ending width '~') +# find ../ -name "*~" -exec rm {} \; + + + diff --git a/build/linux/debug/build.sh b/build/linux/debug/build.sh new file mode 100755 index 0000000..d53c3ad --- /dev/null +++ b/build/linux/debug/build.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +--enable-debug \ +CFLAGS="-g -Wall" \ +CXXFLAGS="-g -Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/build/linux/release/build.sh b/build/linux/release/build.sh new file mode 100755 index 0000000..d1e4027 --- /dev/null +++ b/build/linux/release/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +CFLAGS="-Wall" \ +CXXFLAGS="-Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/build/osx/debug/build.sh b/build/osx/debug/build.sh new file mode 100755 index 0000000..d53c3ad --- /dev/null +++ b/build/osx/debug/build.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +--enable-debug \ +CFLAGS="-g -Wall" \ +CXXFLAGS="-g -Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/build/osx/release/build.sh b/build/osx/release/build.sh new file mode 100755 index 0000000..d1e4027 --- /dev/null +++ b/build/osx/release/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +CFLAGS="-Wall" \ +CXXFLAGS="-Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..f08b770 --- /dev/null +++ b/configure.ac @@ -0,0 +1,92 @@ +# +# Use "autoreconf --force --install" to update depedent files after changing +# this configure.ac or any of the Makefile.am files. +# + +AC_INIT([proj],[1.0],[proj@larke.org]) +AC_CONFIG_AUX_DIR([build-aux]) # put aux files in build-aux +AM_INIT_AUTOMAKE([1.9 -Wall foreign subdir-objects]) # subdir-objects needed for non-recursive make +AC_CONFIG_SRCDIR([src/proj/main.c]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) + +LT_INIT + +# Check for programs +AC_PROG_CC +AC_PROG_CXX +# AC_PROG_RANLIB # required for static librarires + +# Checks for libraries. +AC_CHECK_LIB([cairo],[cairo_debug_reset_static_data],[AC_MSG_RESULT([The 'cairo' library was found.])],[AC_MSG_ERROR([The 'cairo' library was not found.])]) +#TODO: add more library checks + + +# Checks for header files. +AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h limits.h mach/mach.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_OFF_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT64_T + +# Checks for library functions. +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_FSEEKO +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_STRTOD +AC_CHECK_FUNCS([clock_gettime floor memmove memset mkdir pow rint select socket sqrt strcasecmp strchr strcspn strerror strspn strstr strtol]) + + +# The following is a custom macro in ./m4/os_type.m4 +# be sure to also set "ACLOCAL_AMFLAGS = -I m4" in ./Makefile.am +# Defines the config.h variable OS_LINUX or OS_OSX +AX_FUNC_OS_TYPE + +AX_FUNC_OS_64 + +# ac_cv_os_type is set by AX_FUNC_OS_TYPE +AM_CONDITIONAL([OS_LINUX],[test x"${ax_cv_os_type}" = xLinux]) +AM_CONDITIONAL([OS_OSX],[test x"${ax_cv_os_type}" = xDarwin]) +echo "OS='${ax_cv_os_type}'" + +AM_CONDITIONAL([OS_64],[test x"${ax_cv_os_64}" == xx86_64]) +echo "ptr width='${ax_cv_os_64}'" + + +AC_ARG_ENABLE([debug], + [ --enable-debug Turn on debugging], + [case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; + esac],[debug=false]) + +echo "debug=${debug}" + +AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) + +if test x$debug = xfalse; then +AC_DEFINE([NDEBUG], 1,[Debugging off.]) +fi + + + +# AC_ARG_ENABLE([add_lib], +# [ --enable-add_lib Append some additional libs to the end of the library link list.], +# [add_lib="${enableval}"], +# [add_lib=""]) +# +# echo "add_lib=${add_lib}" +# +# AC_SUBST([ADD_LIB], [$add_lib]) + +proj_dir=src/libproj + AC_SUBST([proj_dir]) + +AC_CONFIG_FILES([ Makefile ]) +AC_OUTPUT diff --git a/m4/os_64.m4 b/m4/os_64.m4 new file mode 100644 index 0000000..f84a4a1 --- /dev/null +++ b/m4/os_64.m4 @@ -0,0 +1,8 @@ +AC_DEFUN([AX_FUNC_OS_64], +[AC_CACHE_CHECK([operating system address width], +[ax_cv_os_64], +[ax_cv_os_64=`uname -m`]) +if test x"$ax_cv_os_64" = xx86_64; then +AC_DEFINE([OS_64], 1,[Operating system is 64 bits.]) +fi +]) # AX_FUNC_OS_TYPE diff --git a/m4/os_type.m4 b/m4/os_type.m4 new file mode 100644 index 0000000..9b2b86e --- /dev/null +++ b/m4/os_type.m4 @@ -0,0 +1,11 @@ +AC_DEFUN([AX_FUNC_OS_TYPE], +[AC_CACHE_CHECK([operating system type], +[ax_cv_os_type], +[ax_cv_os_type=`uname`]) +if test x"$ax_cv_os_type" = xLinux; then +AC_DEFINE([OS_LINUX], 1,[Operating system is Linux.]) +fi +if test x"$ax_cv_os_type" = xDarwin; then +AC_DEFINE([OS_OSX], 1,[Operating system is Darwin.]) +fi]) # AX_FUNC_OS_TYPE + diff --git a/src/proj/main.c b/src/proj/main.c new file mode 100644 index 0000000..61b3872 --- /dev/null +++ b/src/proj/main.c @@ -0,0 +1,10 @@ +#include +#include "mylib.h" +#include "config.h" + +int main( int argc, char* argv[] ) +{ + int result = my_func(1,2); + printf("tmpl_app %i\n",result); + return 0; +}