Makefile (xcircuit-3.10.28.tgz) | : | Makefile (xcircuit-3.10.29.tgz) | ||
---|---|---|---|---|
skipping to change at line 261 | skipping to change at line 261 | |||
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 | |||
<<<<<<< HEAD | ||||
REVISION = 21 | REVISION = 21 | |||
======= | ||||
REVISION = 19 | ||||
>>>>>>> 97d13f3926dc2ac94c647c7b48bf1a2aff1627df | ||||
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} ${CFLAGS} ${LDFLAGS} -shared | |||
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 = | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |