projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable new building for newer tcl versions
[rrdtool.git]
/
bindings
/
tcl
/
Makefile.am
diff --git
a/bindings/tcl/Makefile.am
b/bindings/tcl/Makefile.am
index
e31daa8
..
34f4077
100644
(file)
--- a/
bindings/tcl/Makefile.am
+++ b/
bindings/tcl/Makefile.am
@@
-11,17
+11,24
@@
TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
CLEANFILES = tclrrd.o tclrrd.so
SRC_DIR = $(top_srcdir)/src
CLEANFILES = tclrrd.o tclrrd.so
SRC_DIR = $(top_srcdir)/src
-AM_CPPFLAGS =
-I$(TCL_PREFIX)/include -I$(SRC_DIR)
+AM_CPPFLAGS =
$(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
LIB_RUNTIME_DIR = $(libdir)
LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
LIB_RUNTIME_DIR = $(libdir)
-pkglibdir = @TCL_PACKAGE_DIR@
-
-if BUILD_TCL
+if BUILD_TCL_SITE
+tclpkgdir = @TCL_PACKAGE_DIR@
+tclpkg_DATA = pkgIndex.tcl
+tclpkg_SCRIPTS = ifOctets.tcl
+else
+pkglib_DATA = pkgIndex.tcl
+pkglib_SCRIPTS = ifOctets.tcl
+endif
# Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
# library name. So we build and install this library `by hand'.
# Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
# library name. So we build and install this library `by hand'.
@@
-35,15
+42,11
@@
lib_LIBRARIES =
all-local: $(TCL_RRD_LIB)
all-local: $(TCL_RRD_LIB)
-pkglib_DATA = pkgIndex.tcl
-
-pkglib_SCRIPTS = ifOctets.tcl
-
$(TCL_RRD_LIB): tclrrd.o
$(TCL_RRD_LIB): tclrrd.o
- $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd
-lm
+ $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd
_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
tclrrd.o: tclrrd.c
tclrrd.o: tclrrd.c
- $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c
$<
-DVERSION=\"$(VERSION)\"
+ $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c
tclrrd.c
-DVERSION=\"$(VERSION)\"
pkgIndex.tcl:
echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
pkgIndex.tcl:
echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
@@
-52,9
+55,3
@@
install-exec-local: $(TCL_RRD_LIB)
@$(NORMAL_INSTALL)
$(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
@$(NORMAL_INSTALL)
$(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
-endif
-
-diff:
- cd .. ; diff -c -u -r -N --exclude Makefile --exclude html --exclude doc --exclude Makefile.in --exclude Makefile.old --exclude perl --exclude aclocal.m4 --exclude configure rrdtool-1.0.13 rrdtool-1.0.13-ibr > rrdtool-1.0.13-ibr.patch
-
-