Changeset 3c473c in git


Ignore:
Timestamp:
Jul 17, 2010, 11:16:03 PM (13 years ago)
Author:
Kai Krüger <krueger@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
f9f879c1f6d30f79ea772c2280be1b75d3256e46
Parents:
5993263e7b80e15ba43d9e5bae47b11d5a90ae90
Message:
rename directory modules to dyn_modules
anticipating "modules" directory for cmake.



git-svn-id: file:///usr/local/Singular/svn/trunk@13033 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
4 edited
171 moved

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r599326 r3c473c  
    218218
    219219
    220 BINDIST_DIRS        = kernel Singular doc IntegerProgramming modules
     220BINDIST_DIRS        = kernel Singular doc IntegerProgramming dyn_modules
    221221
    222222SHAREDIST_DIRS      = Singular doc emacs

  • configure

    r599326 r3c473c  
    30073007  SUBDIRS="$SUBDIRS emacs"
    30083008fi
    3009 if test -d modules; then
    3010   SUBDIRS="$SUBDIRS modules"
    3011 fi
    3012 if test -d "modules"; then
    3013    CONFIG_SUBDIRS=$CONFIG_SUBDIRS" modules"
    3014    BUILD_SUBDIRS=$BUILD_SUBDIRS" modules"
     3009if test -d dyn_modules; then
     3010  SUBDIRS="$SUBDIRS dyn_modules"
     3011fi
     3012if test -d "dyn_modules"; then
     3013   CONFIG_SUBDIRS=$CONFIG_SUBDIRS" dyn_modules"
     3014   BUILD_SUBDIRS=$BUILD_SUBDIRS" dyn_modules"
    30153015fi
    30163016 

  • configure.in

    r599326 r3c473c  
    848848dnl  SUBDIRS="$SUBDIRS rpm"
    849849dnl fi
    850 if test -d modules; then
    851   SUBDIRS="$SUBDIRS modules"
    852 fi
    853 if test -d "modules"; then
    854 dnl    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" modules/Makefile"
    855    CONFIG_SUBDIRS=$CONFIG_SUBDIRS" modules"
    856    BUILD_SUBDIRS=$BUILD_SUBDIRS" modules"
     850if test -d dyn_modules; then
     851  SUBDIRS="$SUBDIRS dyn_modules"
     852fi
     853if test -d "dyn_modules"; then
     854dnl    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" dyn_modules/Makefile"
     855   CONFIG_SUBDIRS=$CONFIG_SUBDIRS" dyn_modules"
     856   BUILD_SUBDIRS=$BUILD_SUBDIRS" dyn_modules"
    857857fi
    858858 
    … …  
    860860if test "$with_svd" = yes; then
    861861  AC_MSG_RESULT(yes)
    862 dnl    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" modules/Makefile"
     862dnl    OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" dyn_modules/Makefile"
    863863   CONFIG_SUBDIRS=$CONFIG_SUBDIRS" svd"
    864864   BUILD_SUBDIRS=$BUILD_SUBDIRS" svd"

  • dyn_modules/modgen/Makefile.in

    r599326 r3c473c  
    4646##
    4747CFLAGS  += --no-rtti --no-exceptions -O3 -w -fomit-frame-pointer -pipe -fno-implicit-templates \
    48         -g -I${includedir} -I../include -I../../kernel -I../../Singular -DNDEBUG -DMODULE_GENERATOR \
     48        -g -I${includedir} -I../include -I${topsrcdir}/.. -DNDEBUG -DMODULE_GENERATOR \
    4949        -D${SING_UNAME}
    5050LIBS    += -L/usr/local/lib

  • dyn_modules/modgen/typmap.h

    r599326 r3c473c  
    88/* MYYSTYPE avoids including of Singular's struct.h, which is not needed. */
    99#define MYYSTYPE
    10 #include <tok.h>
     10#include <Singular/tok.h>
    1111#undef MYYSTYPE
    1212

  • tests/CMakeLists.txt

    r599326 r3c473c  
    1717
    1818set(test_srcs main.cpp
    19         Singleton.cpp
     19#       Singleton.cpp
    2020  )
    2121
Note: See TracChangeset for help on using the changeset viewer.