Changeset 4866 for branches/r9/lib


Ignore:
Timestamp:
Dec 13, 2014 8:04:54 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9/lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/lib/configure

    r4836 r4866  
    26452645
    26462646
    2647 ac_config_headers="$ac_config_headers core/config.h"
     2647ac_config_headers="$ac_config_headers rappture/config.h"
    26482648
    26492649
     
    76467646
    76477647
    7648 ac_config_files="$ac_config_files Makefile core/Makefile core2/Makefile objects/Makefile objects/RpHash.h"
     7648ac_config_files="$ac_config_files Makefile rappture/Makefile rappture2/Makefile objects/Makefile objects/RpHash.h"
    76497649
    76507650cat >confcache <<\_ACEOF
     
    83408340do
    83418341  case $ac_config_target in
    8342     "core/config.h") CONFIG_HEADERS="$CONFIG_HEADERS core/config.h" ;;
     8342    "rappture/config.h") CONFIG_HEADERS="$CONFIG_HEADERS rappture/config.h" ;;
    83438343    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    8344     "core/Makefile") CONFIG_FILES="$CONFIG_FILES core/Makefile" ;;
    8345     "core2/Makefile") CONFIG_FILES="$CONFIG_FILES core2/Makefile" ;;
     8344    "rappture/Makefile") CONFIG_FILES="$CONFIG_FILES rappture/Makefile" ;;
     8345    "rappture2/Makefile") CONFIG_FILES="$CONFIG_FILES rappture2/Makefile" ;;
    83468346    "objects/Makefile") CONFIG_FILES="$CONFIG_FILES objects/Makefile" ;;
    83478347    "objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES objects/RpHash.h" ;;
  • branches/r9/lib/configure.in

    r4836 r4866  
    22AC_INIT([Rappture],[1.4],[rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(../cf)
    4 AC_CONFIG_HEADER(core/config.h)
     4AC_CONFIG_HEADER(rappture/config.h)
    55
    66#------------------------------------------------------------------------
     
    163163AC_CONFIG_FILES([
    164164    Makefile
    165     core/Makefile
    166     core2/Makefile
     165    rappture/Makefile
     166    rappture2/Makefile
    167167    objects/Makefile
    168168    objects/RpHash.h
  • branches/r9/lib/objects/Makefile.in

    r4836 r4866  
    3434INCLUDES    = \
    3535                -I. \
    36                 -I../core \
     36                -I../rappture \
    3737                -I$(srcdir) \
    38                 -I$(srcdir)/../core \
     38                -I$(srcdir)/../rappture \
    3939                -I$(includedir)
    40 LIBS        = -L../core -lrappture
     40LIBS        = -L../rappture -lrappture
    4141
    4242
  • branches/r9/lib/objects/RpHash.c

    r4836 r4866  
    4141 */
    4242
    43 #include "../core/config.h"
     43#include "../rappture/config.h"
    4444#include <RpInt.h>
    4545
  • branches/r9/lib/rappture2/Makefile.in

    r4836 r4866  
    3636SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    3737CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    38 LIB_SEARCH_DIRS = -L../core @LIB_SEARCH_DIRS@
     38LIB_SEARCH_DIRS = -L../rappture @LIB_SEARCH_DIRS@
    3939LIB_RUNTIME_DIR  = $(libdir)
    4040CFLAGS          = @CFLAGS@ -fPIC
     
    5959INCLUDES        = \
    6060                -I$(srcdir) \
    61                 -I$(srcdir)/../core \
     61                -I$(srcdir)/../rappture \
    6262                -I$(includedir)
    6363
Note: See TracChangeset for help on using the changeset viewer.