Makefile (xcircuit-3.10.29.tgz) | : | Makefile (xcircuit-3.10.30.tgz) | ||
---|---|---|---|---|
skipping to change at line 241 | skipping to change at line 241 | |||
ECHO_C = | ECHO_C = | |||
ECHO_N = -n | ECHO_N = -n | |||
ECHO_T = | ECHO_T = | |||
EGREP = /bin/grep -E | EGREP = /bin/grep -E | |||
EXEEXT = | EXEEXT = | |||
EXTRA_LIB_SPECS = -lm | EXTRA_LIB_SPECS = -lm | |||
GREP = /bin/grep | GREP = /bin/grep | |||
GS_EXEC = gs | GS_EXEC = gs | |||
GS_LIBS = | GS_LIBS = | |||
HAVE_LGF = LGF | HAVE_LGF = LGF | |||
INC_SPECS = -I/usr/local/include -I/usr/include | INC_SPECS = -I/usr/include -I/usr/include | |||
INSTALL = /bin/install -c | INSTALL = /bin/install -c | |||
INSTALL_DATA = ${INSTALL} -m 644 | INSTALL_DATA = ${INSTALL} -m 644 | |||
INSTALL_PROGRAM = ${INSTALL} | INSTALL_PROGRAM = ${INSTALL} | |||
INSTALL_SCRIPT = ${INSTALL} | INSTALL_SCRIPT = ${INSTALL} | |||
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s | INSTALL_STRIP_PROGRAM = $(install_sh) -c -s | |||
INSTALL_TARGET = install-recursive | INSTALL_TARGET = install-recursive | |||
INTERPRETER = TCL | INTERPRETER = TCL | |||
INTERP_PATH = tcl | INTERP_PATH = tcl | |||
LD = /bin/ld | LD = /bin/ld | |||
LDDL_FLAGS = -Wl,--export-dynamic -Wl,--version-script=symbol.map | LDDL_FLAGS = -Wl,-z,relro -Wl,--export-dynamic -Wl,--version-script=symbol.map | |||
LDFLAGS = | LDFLAGS = | |||
LD_RUN_PATH = -Wl,-rpath,/usr/local/lib | LD_RUN_PATH = -Wl,-rpath,/usr/lib64 | |||
LIBOBJS = | LIBOBJS = | |||
LIBS = -ldl -lz -lpthread -lm -lz -lXt -lSM -lICE -lm -lX11 -lXpm $(cairo_LIB | LIBS = -ldl -lz -lpthread -lieee -lm -lz -lXt -lSM -lICE -lm -lX11 -lXpm $(ca | |||
S) $(fontconfig_LIBS) ${GS_LIBS} | iro_LIBS) $(fontconfig_LIBS) ${GS_LIBS} | |||
LIB_SPECS = -L/usr/local/lib -ltcl8.6 -L/usr/lib64 -ltk8.6 | LIB_SPECS = -L/usr/lib64 -ltcl8.6 -L/usr/lib64 -ltk8.6 | |||
LTLIBOBJS = | LTLIBOBJS = | |||
M4 = /bin/m4 | M4 = /bin/m4 | |||
MAKEINFO = makeinfo | MAKEINFO = makeinfo | |||
MKDIR_P = /bin/mkdir -p | MKDIR_P = /bin/mkdir -p | |||
OBJEXT = o | OBJEXT = o | |||
PACKAGE = xcircuit | PACKAGE = xcircuit | |||
PACKAGE_BUGREPORT = | PACKAGE_BUGREPORT = | |||
PACKAGE_NAME = | PACKAGE_NAME = | |||
PACKAGE_STRING = | PACKAGE_STRING = | |||
PACKAGE_TARNAME = | PACKAGE_TARNAME = | |||
PACKAGE_URL = | PACKAGE_URL = | |||
PACKAGE_VERSION = | PACKAGE_VERSION = | |||
PATH_SEPARATOR = : | PATH_SEPARATOR = : | |||
PKG_CONFIG = /bin/pkg-config | PKG_CONFIG = /bin/pkg-config | |||
PKG_CONFIG_LIBDIR = | PKG_CONFIG_LIBDIR = | |||
PKG_CONFIG_PATH = | PKG_CONFIG_PATH = | |||
PYTHON = | PYTHON = | |||
RANLIB = ranlib | RANLIB = ranlib | |||
REVISION = 21 | REVISION = 30 | |||
SET_MAKE = | SET_MAKE = | |||
SHDLIB_EXT = .so | SHDLIB_EXT = .so | |||
SHELL = /bin/sh | SHELL = /bin/sh | |||
SHLIB_LD = ${CC} ${CFLAGS} ${LDFLAGS} -shared | SHLIB_LD = ${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@} | |||
SHLIB_LIB_SPECS = | SHLIB_LIB_SPECS = | |||
SPICE_EXEC = ngspice | SPICE_EXEC = ngspice | |||
STARTUP_FILE = xcstartup.tcl | STARTUP_FILE = xcstartup.tcl | |||
STDLIBS = | STDLIBS = | |||
STRIP = | STRIP = | |||
SUBDIRS = | SUBDIRS = | |||
SUBLIB = | SUBLIB = | |||
TCL_LIB_DIR = /usr/local/lib | TCL_LIB_DIR = /usr/lib64 | |||
VERSION = 3.10 | VERSION = 3.10 | |||
WISH_EXE = /usr/bin/wish | WISH_EXE = /usr/bin/wish | |||
WRAPPER_SCRIPT = wrapper.tcl | WRAPPER_SCRIPT = wrapper.tcl | |||
XCIRCUIT_TARGET = tcl | XCIRCUIT_TARGET = tcl | |||
XMKMF = | XMKMF = | |||
X_CFLAGS = | X_CFLAGS = | |||
X_EXTRA_LIBS = | X_EXTRA_LIBS = | |||
X_LIBS = | X_LIBS = | |||
X_PRE_LIBS = -lSM -lICE | X_PRE_LIBS = -lSM -lICE | |||
abs_builddir = /home/tim/gitsrc/xcircuit | abs_builddir = /home/tim/gitsrc/xcircuit | |||
skipping to change at line 361 | skipping to change at line 361 | |||
target_vendor = unknown | target_vendor = unknown | |||
top_build_prefix = | top_build_prefix = | |||
top_builddir = . | top_builddir = . | |||
top_srcdir = . | top_srcdir = . | |||
AUTOMAKE_OPTIONS = foreign no-dependencies no-dist | AUTOMAKE_OPTIONS = foreign no-dependencies no-dist | |||
AM_CFLAGS = $(cairo_CFLAGS) $(fontconfig_CFLAGS) ${GS_CFLAGS} | AM_CFLAGS = $(cairo_CFLAGS) $(fontconfig_CFLAGS) ${GS_CFLAGS} | |||
# Additional files to distribute | # Additional files to distribute | |||
EXTRA_DIST = COPYRIGHT README README.ISOLatin2 README.notes | EXTRA_DIST = COPYRIGHT README README.ISOLatin2 README.notes | |||
<<<<<<< HEAD | <<<<<<< HEAD | |||
<<<<<<< HEAD | ||||
FULL_VERSION = 3.10.21 | FULL_VERSION = 3.10.21 | |||
======= | ======= | |||
FULL_VERSION = 3.10.19 | FULL_VERSION = 3.10.19 | |||
>>>>>>> 97d13f3926dc2ac94c647c7b48bf1a2aff1627df | >>>>>>> 97d13f3926dc2ac94c647c7b48bf1a2aff1627df | |||
======= | ||||
FULL_VERSION = 3.10.30 | ||||
>>>>>>> master | ||||
# Menudep program generates menudep.h needed by some of the | # Menudep program generates menudep.h needed by some of the | |||
# source files for Xcircuit | # source files for Xcircuit | |||
noinst_PROGRAMS = menudep$(EXEEXT) | noinst_PROGRAMS = menudep$(EXEEXT) | |||
# Automake files | # Automake files | |||
ac_aux_dir = dist | ac_aux_dir = dist | |||
# Temporary directory (if not overridden by environment variable TMPDIR) | # Temporary directory (if not overridden by environment variable TMPDIR) | |||
tmpdir = /tmp | tmpdir = /tmp | |||
End of changes. 9 change blocks. | ||||
9 lines changed or deleted | 13 lines changed or added |