X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=bindings%2Ftcl%2FMakefile.am;h=265191d6531d81f918096f372b99ea9d0894f906;hb=d9822df7ed5e8122cf3a62e4e99678e94007f504;hp=3e183c681eb58efa04c378df5d026729639a3682;hpb=ecfac614b914cef110a81ac665997a9b186da500;p=pkg-rrdtool.git diff --git a/bindings/tcl/Makefile.am b/bindings/tcl/Makefile.am index 3e183c6..265191d 100644 --- a/bindings/tcl/Makefile.am +++ b/bindings/tcl/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST = README tclrrd.c VERSION = @VERSION@ AM_CFLAGS = @CFLAGS@ +### no including this by default @WERROR@ TCL_PREFIX = @TCL_PREFIX@ TCL_SHLIB_LD = @TCL_SHLIB_LD@ @@ -12,12 +13,12 @@ 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_INC_DIR = @TCL_INC_DIR@ +TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@ CLEANFILES = tclrrd.o tclrrd.so SRC_DIR = $(top_srcdir)/src -AM_CPPFLAGS = -I$(TCL_INC_DIR) -I$(SRC_DIR) -DUSE_TCL_STUBS +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) @@ -26,8 +27,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@ tclpkg_DATA = pkgIndex.tcl tclpkg_SCRIPTS = ifOctets.tcl else -pkglib_DATA = pkgIndex.tcl -pkglib_SCRIPTS = ifOctets.tcl +pkgdata_DATA = pkgIndex.tcl +pkgdata_SCRIPTS = ifOctets.tcl endif # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as @@ -46,7 +47,7 @@ $(TCL_RRD_LIB): tclrrd.o $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS) 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]\"" > $@