Changeset a3bb5d in git


Ignore:
Timestamp:
Sep 12, 2011, 8:03:12 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
ae133ba91b95dd0c7bbb4be8f6c934e62042c013
Parents:
d67fcad45b24dac7faa0f1b23dc90bec67b9de70
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-12 20:03:12+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:44+01:00
Message:
FIX: special linker flags for dlopen'ing dynamic .so-s.
FIX: pass correct Singular pathes to tests
Convention: release versio nof test should be called testr, debug: testg
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/makefile

    rd67fcad ra3bb5d  
    240240
    241241Singular: tesths.o libSingular.a
    242         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS}
     242        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS} ${LD_DYN_FLAGS}
    243243
    244244Singularg: tesths.og libSingular_g.a
    245         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGSG} ${DEFSG} tesths.og -o $@ -L. -lSingular_g -L../kernel -lkernel_g -L../numeric -lnumeric_g ${LIBPOLYS_LIBSG}
     245        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGSG} ${DEFSG} tesths.og -o $@ -L. -lSingular_g -L../kernel -lkernel_g -L../numeric -lnumeric_g ${LIBPOLYS_LIBSG} ${LD_DYN_FLAGS}
    246246
    247247
     
    427427
    428428# My headers test
    429 check: testr testg
    430         ./testr
    431         ./testg
     429check: testg testr
     430        SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testg
     431        SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testr
     432
     433testg: test.og libSingular_g.a
     434        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@  -L. -lSingular_g -L../kernel -lkernel_g -L../numeric -lnumeric_g ${LIBPOLYS_LIBSG} ${LD_DYN_FLAGS}
    432435
    433436testr: test.o libSingular.a
    434         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@  -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS}
    435 
    436 testg: test.og libSingular_g.a
    437         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@  -L. -lSingular_g -L../kernel -lkernel_g -L../numeric -lnumeric_g ${LIBPOLYS_LIBSG}
     437        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@  -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS} ${LD_DYN_FLAGS}
     438
  • kernel/.gitignore

    rd67fcad ra3bb5d  
    22p_Procs_Static.inc
    33prCopy.inc
    4 test
     4testr
    55testg
  • kernel/makefile

    rd67fcad ra3bb5d  
    175175
    176176clean: mostlyclean
    177         -rm -f *.bak *.d *.dd depend *.a *.so* test testg test-g
     177        -rm -f *.bak *.d *.dd depend *.a *.so* testr testg
    178178
    179179distclean: clean
     
    302302
    303303testg: test.og libkernel_g.a
    304         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@ -L. -lkernel_g ${LIBPOLYS_LIBSG}
    305 
    306 test: test.o libkernel.a
    307         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@ -L. -lkernel ${LIBPOLYS_LIBS}
     304        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@ -L. -lkernel_g ${LIBPOLYS_LIBSG} ${LD_DYN_FLAGS}
     305
     306testr: test.o libkernel.a
     307        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@ -L. -lkernel ${LIBPOLYS_LIBS} ${LD_DYN_FLAGS}
    308308
    309309# My headers test
    310 check: all test testg
    311         SINGULAR_ROOT_DIR=`pwd/../` SINGULARPATH="$SINGULAR_ROOT_DIR/libpolys/polys/.libs" ./test
    312         SINGULAR_ROOT_DIR=`pwd/../` SINGULARPATH="$SINGULAR_ROOT_DIR/libpolys/polys/.libs" ./testg
     310check: all testg testr
     311        SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testg
     312        SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testr
Note: See TracChangeset for help on using the changeset viewer.