Changeset 4861 for branches/r9
- Timestamp:
- Dec 12, 2014 8:40:24 AM (10 years ago)
- Location:
- branches/r9
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/lang/R/Makefile.in
r3749 r4861 21 21 R = @R@ 22 22 23 coresrcdir = `pwd`/$(srcdir)/../../src/core24 corelibdir = `pwd`/../../src/core25 23 R_flags = --configure-args='--with-rappture-include=$(includedir) \ 26 24 --with-rappture-lib=$(libdir)' -
branches/r9/lang/java/Makefile.in
r4837 r4861 43 43 RM = rm -f 44 44 45 INCLUDES = $(JAVA_INCLUDES) -I $(srcdir)/../../src/core-I .46 LIBS = -L ../../src/core-lrappture45 INCLUDES = $(JAVA_INCLUDES) -I$(includedir) -I . 46 LIBS = -L$(libdir) -lrappture 47 47 48 48 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(SHLIB_CFLAGS) $(INCLUDES) $(DEFINES) -
branches/r9/lang/matlab/Makefile.in
r1944 r4861 24 24 matlabdir = $$RAPPTURE_INSTALL_DIR/lib/matlab 25 25 26 INCLUDES = \ 27 -I$(srcdir)/../../src/core \ 28 -I$(prefix)/include 26 INCLUDES = -I$(includedir) 27 29 28 DEFINES = -g 30 LIBS = -L../../src/core-L$(libdir) -lrappture29 LIBS = -L$(libdir) -lrappture 31 30 32 31 MEX_FLAGS = $(MEX_ARCH) $(INCLUDES) $(DEFINES) -
branches/r9/lang/octave/octave2/Makefile.in
r3471 r4861 20 20 INCLUDES = \ 21 21 -I$(srcdir) \ 22 -I$(srcdir)/../../../src/core \ 23 -I$(prefix)/include 22 -I$(includedir) 24 23 DEFINES = 25 LIBS = -L ../../../src/core-lrappture24 LIBS = -L$(libdir) -lrappture 26 25 OCT_FLAGS = $(INCLUDES) $(DEFINES) 27 26 -
branches/r9/lang/octave/octave3/Makefile.in
r3471 r4861 20 20 INCLUDES = \ 21 21 -I$(srcdir) \ 22 -I$(srcdir)/../../../src/core \ 23 -I$(prefix)/include 22 -I$(includedir) 24 23 DEFINES = 25 LIBS = -L ../../../src/core-lrappture24 LIBS = -L$(libdir) -lrappture 26 25 OCT_FLAGS = $(INCLUDES) $(DEFINES) 27 26 -
branches/r9/lang/perl/Makefile.PL.in
r1083 r4861 21 21 ); 22 22 } 23 @RAPPTURE_INC_SEARCHPATH = ( "@ srcdir@/../../src/core", "@prefix@/include",23 @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include", 24 24 "../include", "/usr/local/include", "/opt/include"); 25 25 $RAPPTURE_INC = "rappture.h"; … … 29 29 "/opt/expat-2.0.0/lib", "/opt/expat/lib" ); 30 30 $EXPAT_INC="expat.h"; 31 @RAPPTURE_LIB_SEARCHPATH = ( " ../../../src/core", "@prefix@/lib",31 @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib", 32 32 "@libdir@", 33 33 "../src", "/usr/local/lib", "/opt/lib" ); -
branches/r9/lang/perl/Makefile.in
r2549 r4861 60 60 INCLUDES = \ 61 61 -I$(srcdir) \ 62 -I$( srcdir)/../../src/core\62 -I$(includedir) \ 63 63 -I$(archlibexp)/CORE 64 64 65 65 LIBS = \ 66 -L ../../src/core-lrappture \66 -L$(libdir) -lrappture \ 67 67 $(PERL_LIBSPEC) \ 68 68 -lexpat -
branches/r9/lang/python/Makefile.in
r3471 r4861 24 24 PYTHON_VERSION = @PYTHON_VERSION@ 25 25 26 python_flags = --library-dirs=$(libdir) :../../src/core\27 --include-dirs=$( srcdir)/../../src/core:$(PYTHON_INCDIR)26 python_flags = --library-dirs=$(libdir) \ 27 --include-dirs=$(includedir):$(PYTHON_INCDIR) 28 28 pythonlib = $(libdir)/python$(PYTHON_VERSION)/site-packages 29 29 envfile = python.env -
branches/r9/lang/python/setup.py.in
r1584 r4861 4 4 tmpdir = 'build/tmp/' 5 5 srcdir = '@srcdir@/Rappture/' 6 incdir = '@ srcdir@/../../src/core'7 libdir = '@ srcdir@/../../src/core'6 incdir = '@includedir@' 7 libdir = '@libdir@' 8 8 9 9 library_module = Extension('Rappture.library', -
branches/r9/lang/ruby/Makefile.in
r3471 r4861 36 36 CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ 37 37 INCLUDES = -I$(srcdir) \ 38 -I$(srcdir)/../../src/core \39 38 -I$(includedir) \ 40 39 $(RUBY_CPPFLAGS) … … 49 48 50 49 LIBS = \ 51 -L ../../src/core-lrappture \50 -L$(libdir) -lrappture \ 52 51 $(RUBY_LIBRUBYARG) 53 52 -
branches/r9/lang/ruby/build.rb.in
r1081 r4861 11 11 cxxflags = "@CXXFLAGS@" 12 12 srcdir = "@srcdir@" 13 libdir = "@libdir@" 14 includedir = "@includedir@" 13 15 install = "@INSTALL@" 14 16 shlib_cflags = "@SHLIB_CFLAGS@" … … 57 59 f.printf("CFLAGS = #{cxxflags}\n") 58 60 f.printf("CXX_DLFLAGS = #{cxx_dlflags}\n") 59 f.printf("INCLUDES = -I$(incdir) -I#{ srcdir}/../../src/core-I$(archdir)/\n")61 f.printf("INCLUDES = -I$(incdir) -I#{includedir} -I$(archdir)/\n") 60 62 f.printf("INSTALL = #{install}\n") 61 63 f.printf("SHLIB_FLAGS = $(CFLAGS) $(CXX_DLFLAGS) $(LDFLAGS) $(INCLUDES)\n\n") … … 63 65 f.printf("SHLIB_LD = #{ldshared}\n") 64 66 f.printf("LDFLAGS = #{ldflags}\n") 65 f.printf("LIBS = -L ../../src/core-lrappture #{libs}\n\n")67 f.printf("LIBS = -L#{libdir} -lrappture #{libs}\n\n") 66 68 f.printf("package = $(TARGET).$(DLEXT)\n\n") 67 69 f.printf("all: extension\n\n") -
branches/r9/lang/tcl/src/Makefile.in
r4852 r4861 32 32 CXX_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) 33 33 34 INCLUDES = -I$(srcdir) \ 35 -I../../../src/core \ 36 -I$(srcdir)/../../../src/core \ 37 -I$(srcdir)/../../../src/objects \ 38 -I$(includedir) 34 INCLUDES = -I$(srcdir) \ 35 -I$(includedir) 36 39 37 RAPPTURE_VERSION = @PACKAGE_VERSION@ 40 38 SVN_VERSION := $(shell svnversion $(srcdir)) … … 49 47 CDEBUGFLAGS = -g -Wall 50 48 51 LIBS = \52 -L../../../src/core-lrappture \53 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++49 LIBS = \ 50 -L$(libdir) -lrappture \ 51 $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++ 54 52 55 53 OBJS = \
Note: See TracChangeset
for help on using the changeset viewer.