"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Makefile.conf" between
yudit-3.0.5.tar.gz and yudit-3.0.7.tar.gz

About: yudit is an Unicode plain-text editor that can do True Type font rendering, printing, transliterated keyboard input and handwriting recognition with no dependencies on external engines.

Makefile.conf  (yudit-3.0.5):Makefile.conf  (yudit-3.0.7)
ifeq ($(wildcard /etc/passwd),/etc/passwd) ifeq ($(wildcard /etc/passwd),/etc/passwd)
TOPDIR = /home/gsinai/Build/Yudit/yudit-3.0.5 TOPDIR = /Users/gsinai/Build/yudit-3.0.7
MSGMERGE=/usr/bin/msgmerge MSGMERGE=:
HAVE_LOCALE = -DHAVE_LOCALE HAVE_LOCALE =
HAVE_SET_IM_VALUES=-DHAVE_SET_IM_VALUES HAVE_SET_IM_VALUES=
NEED_SET_IM_VALUES_PROTO=-DNEED_SET_IM_VALUES_PROTO NEED_SET_IM_VALUES_PROTO=
prefix = /usr prefix = /Applications/Yudit.app/Contents/MacOS
exec_prefix = ${prefix} exec_prefix = ${prefix}
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
bindir = ${exec_prefix}/bin bindir = ${exec_prefix}/bin
datarootdir = ${prefix}/share datarootdir = ${prefix}/share
datadir = ${prefix}/share datadir = ${prefix}/share
mandir = ${datarootdir}/man mandir = ${datarootdir}/man
LPR_COMMAND = /usr/bin/lpr LPR_COMMAND = /usr/bin/lpr
LPR_CFLAGS = -DLPR_COMMAND=\"/usr/bin/lpr\" LPR_CFLAGS = -DLPR_COMMAND=\"/usr/bin/lpr\"
CXX = g++ CXX = g++
CXXFLAGS = -g -O2 CXXFLAGS = -g -O2
CFLAGS = -g -O2 CFLAGS = -g -O2
LDFLAGS = LDFLAGS =
LIBS = -ldl LIBS =
TRANSLATE_LFLAGS = TRANSLATE_LFLAGS =
CPPFLAGS = -I$(TOPDIR) -DHAVE_LONG_LONG -Wall -DHAVE_MMAP $(CFLAGS) CPPFLAGS = -I$(TOPDIR) -DHAVE_LONG_LONG -Wall -DHAVE_MMAP $(CFLAGS)
INSTALL = @INSTALL@ INSTALL = @INSTALL@
YUDIT_DATA = /usr/share/yudit YUDIT_DATA = /Applications/Yudit.app/Contents/MacOS/share/yudit
INSTALL = $(TOPDIR)/bin/install-sh -c INSTALL = $(TOPDIR)/bin/install-sh -c
# Strip binary # Strip binary
INSTALL_PROGRAM = $(TOPDIR)/bin/install-sh -c -s INSTALL_PROGRAM = $(TOPDIR)/bin/install-sh -c -s
INSTALL_DATA = $(TOPDIR)/bin/install-sh -c -m 644 INSTALL_DATA = $(TOPDIR)/bin/install-sh -c -m 644
X_CFLAGS = X_CFLAGS =
X_LIBS = X_LIBS =
X_PRE_LIBS = -lSM -lICE X_PRE_LIBS =
X_EXTRA_LIBS = X_EXTRA_LIBS =
USE_X11 = -DUSE_X11=1 USE_X11 = -DUSE_X11=0
X11_LIB = -lX11 X11_LIB =
AR = ar cr AR = ar cr
# #
# For Sun's SUNWspro compiler you need to have CC's AR # For Sun's SUNWspro compiler you need to have CC's AR
# otherwise you get linking errors, like: # otherwise you get linking errors, like:
# #
# SVector<SString>::__vtbl ../stoolkit/libstoolkit.a(SStringVector.o) # SVector<SString>::__vtbl ../stoolkit/libstoolkit.a(SStringVector.o)
# [Hint: try checking whether the first non-inlined, # [Hint: try checking whether the first non-inlined,
# non-pure virtual function of class SVector<SString> is defined] # non-pure virtual function of class SVector<SString> is defined]
# #
skipping to change at line 80 skipping to change at line 80
# #
# This TRANSLATE_LFLAGS should not be here. But this works on solaris... # This TRANSLATE_LFLAGS should not be here. But this works on solaris...
# or, does it? # or, does it?
ALL_LIBS=$(X_EXTRA_LIBS) $(X_LIBS) $(X11_LIB) $(LIBS) $(TRANSLATE_LFLAGS) ALL_LIBS=$(X_EXTRA_LIBS) $(X_LIBS) $(X11_LIB) $(LIBS) $(TRANSLATE_LFLAGS)
else else
# #
# TOPDIR and YUDIT_DATA is all your need. # TOPDIR and YUDIT_DATA is all your need.
# #
UNIX_TOPDIR = /home/gsinai/Build/Yudit/yudit-3.0.5 UNIX_TOPDIR = /Users/gsinai/Build/yudit-3.0.7
TOPDIR=/Build/Yudit/$(notdir $(UNIX_TOPDIR:%/=%)) TOPDIR=/Build/Yudit/$(notdir $(UNIX_TOPDIR:%/=%))
YUDIT_DATA=/usr/share/yudit YUDIT_DATA=/usr/share/yudit
CPPFLAGS:=$(CPPFLAGS) -nologo -DUSE_WINAPI -I$(TOPDIR) CPPFLAGS:=$(CPPFLAGS) -nologo -DUSE_WINAPI -I$(TOPDIR)
# Zi is debug on # Zi is debug on
CXX=cl /Zi CXX=cl /Zi
LD=cl /Zi LD=cl /Zi
AR=lib /out: AR=lib /out:
ALL_LIBS=advapi32.lib wsock32.lib shell32.lib ALL_LIBS=advapi32.lib wsock32.lib shell32.lib
SPLATFORM=WINDOWS SPLATFORM=WINDOWS
SWINDOWS=WIN32 SWINDOWS=WIN32
SWINDOW_FLAGS= SWINDOW_FLAGS=
# #
# Do not define HAVE_WS2_32_DLL # Do not define HAVE_WS2_32_DLL
# because it wont work on Windows95 # because it wont work on Windows95
# #
#SWINDOW_LIBS=user32.lib ws2_32.lib gdi32.lib imm32.lib #SWINDOW_LIBS=user32.lib ws2_32.lib gdi32.lib imm32.lib
SWINDOW_LIBS=user32.lib gdi32.lib imm32.lib SWINDOW_LIBS=user32.lib gdi32.lib imm32.lib
HAVE_LOCALE= HAVE_LOCALE=
HAVE_SET_IM_VALUES= HAVE_SET_IM_VALUES=
NEED_SET_IM_VALUES_PROTO=-DNEED_SET_IM_VALUES_PROTO NEED_SET_IM_VALUES_PROTO=
endif endif
ifeq (x${YUDIT_MYTOOL},x) ifeq (x${YUDIT_MYTOOL},x)
MYTOOL := $(TOPDIR)/mytool/mytool MYTOOL := $(TOPDIR)/mytool/mytool
else else
MYTOOL := ${YUDIT_MYTOOL} MYTOOL := ${YUDIT_MYTOOL}
endif endif
 End of changes. 7 change blocks. 
13 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)