Makefile (xcircuit-3.10.28.tgz) | : | Makefile (xcircuit-3.10.29.tgz) | ||
---|---|---|---|---|
skipping to change at line 360 | skipping to change at line 360 | |||
target_os = linux-gnu | target_os = linux-gnu | |||
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 | ||||
FULL_VERSION = 3.10.21 | FULL_VERSION = 3.10.21 | |||
======= | ||||
FULL_VERSION = 3.10.19 | ||||
>>>>>>> 97d13f3926dc2ac94c647c7b48bf1a2aff1627df | ||||
# 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. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |