"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "config.was" between
bed-3.0.3.src.tar.xz and bed-3.1.0.src.tar.xz

About: bed is an adjustable data format binary editor.

config.was  (bed-3.0.3.src.tar.xz):config.was  (bed-3.1.0.src.tar.xz)
#config. Generated from config.in by configure.
ifneq ($(INCLUDEDCONFIG),yes) ifneq ($(INCLUDEDCONFIG),yes)
CFLAGS+= -Wall -Wno-write-strings -Wno-char-subscripts
PROGRAMC=
PROGRAMLD=
CPPFLAGS=
GXXVERSION=c++20
CFLAGS=$(CPPFLAGS)
CXXFLAGS=$(CPPFLAGS) -std=$(GXXVERSION)
LDFLAGS= #-std=$(GXXVERSION)
CFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts
CXXFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts
LDFLAGS+= LDFLAGS+=
BEDSRCDIR=/home/jka/bed/bed-0.2.27 EXTRALIBS=
OTHERLIBS=
export GNUSTRIP=yes
ifeq ($(BEDSRCDIR),)
export BEDSRCDIR=/home/jka/src/bed-3.1.0
endif
REGEX_DIR=$(BEDSRCDIR)/regex-0.13
#include $(BEDSRCDIR)/prognames.mk #include $(BEDSRCDIR)/prognames.mk
INCLUDEDCONFIG=yes INCLUDEDCONFIG=yes
export LC_ALL=POSIX export LC_ALL=POSIX
# test,sed,sort,grep etc should produce exactly the intented output. # test,sed,sort,grep etc should produce exactly the intented output.
# Data access don't work anymore if e.g. sort order is changed # Data access don't work anymore if e.g. sort order is changed
# and some idiot made sort (Mandrake 7.2) produce different sort order # and some idiot made sort (Mandrake 7.2) produce different sort order
# depending on locale. try # depending on locale. try
#LC_ALL=nl sort #LC_ALL=nl sort
#aA #aA
#AB #AB
export LOWVERSION=27 export MAN2HTML=../man2html/man2html
export MIDVERSION=2 #export LOWVERSION=@LOWVERSION@
export UPVERSION=0 #export MIDVERSION=@MIDVERSION@
export VERSION=0.2.27 #export UPVERSION=@UPVERSION@
export VERSION=3.1.0
export PROGRAM=bed export PROGRAM=bed
SYSTEM=CYGWIN_NT-6.0 SYSTEM=
CYGWIN=yes export WINDOWS=yes
export HOST_CPU=x86_64
export HOST_OS=mingw32
HOSTCONF=conf-.h
HOST_ALIAS=
export HOSTEXEEXT=.exe
export EXEEXT=$(HOSTEXEEXT)
include $(BEDSRCDIR)/build
CYGWIN=no
HAVE_MAGIC_H=
export HAS_RE_SEARCH=n export HAS_RE_SEARCH=n
export CONFFILE=$(PROGRAM)rc export CONFFILE=$(PROGRAM)rc
export CONFLASTDIR=$(PROGRAM)-$(VERSION) export CONFLASTDIR=$(PROGRAM)-$(VERSION)
export ROOTDIR= export ROOTDIR=
HAS_APPLICATIONS=/usr/share/applications HAS_APPLICATIONS=
LN_S=ln -s LN_S=cp -pR
HAVE_LN_R=y
# compile support for the use of plugins. Needs libdl # compile support for the use of plugins. Needs libdl
# if CONFIG_PLUGIN=n then GIVE=.. in plugin/examples/Makefile determines # if CONFIG_PLUGIN=n then GIVE=.. in plugin/examples/Makefile determines
# which plugins are linked in instead # which plugins are linked in instead
DL_LIBRARY=-ldl DL_LIBRARY=
CONFIG_PLUGIN=y CONFIG_PLUGIN=n
USE_RE2=
ifeq ($(USE_RE2),1)
CFLAGS+=-DUSE_RE2=1
CXXFLAGS+=-DUSE_RE2=1
EXTRALIBS+=
endif
USE_HYPERSCAN=
ifeq ($(USE_HYPERSCAN),1)
CFLAGS+=-DUSE_HYPERSCAN=1
CXXFLAGS+=-DUSE_HYPERSCAN=1
EXTRALIBS+=
endif
ifneq ($(HAS_RE_SEARCH),y) ifneq ($(HAS_RE_SEARCH),y)
OBJECTS=regex.o OBJECTS=$(REGEX_DIR)/regex.o
endif endif
ifneq ($(CYGWIN),yes)
DYNAMICCURSES=
STATICCURSES=
CURSESLIB=-lncurses
CFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1
CXXFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1
# user threads to go on while making a searchlist.
# Adds instability, but is also the most widely used.
# Not tried with win95 requires ReadFile with offset in OVERLAPPED
CONFIG_THREADS=n
THREADSLIB=
ifneq ($(WINDOWS),yes)
# The user of the program is unix minded # The user of the program is unix minded
FULLUNIX=y FULLUNIX=y
else else
CFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE
CXXFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE
FULLUNIX=n FULLUNIX=n
export EXEEXT=.exe
CONFIG_PLUGIN=n CONFIG_PLUGIN=n
export BIOSDISK=y #export BIOSDISK=y
CFLAGS+=-D_WIN32=1 -DUSE_WINFILE -DBIOSDISK #set to y if you want to to use raw disk edit under win95/98/ME
WINDOWS=y CYGWINDLL=
# >= 1007 no support for Windows 95/98/ME anymore so
# shouldn't be defined -DBIOSDISK -DRUNONWIN95=1
ifeq ($(shell if test 0$(CYGWINDLL) -ge 01007;then echo nowin95;else echo win95
;fi),nowin95)
export BIOSDISK=n
endif
ifeq ($(BIOSDISK),y)
CFLAGS+= -DBIOSDISK -DRUNONWIN95=1
CXXFLAGS+= -DBIOSDISK -DRUNONWIN95=1
CONFIG_THREADS=n
endif
endif endif
ifeq ($(FULLUNIX),y) ifeq ($(FULLUNIX),y)
#LINK some useful 'plugins' in main program instead of dynamic linkage? #LINK some useful 'plugins' in main program instead of dynamic linkage?
CONFIG_LINKINPLUGINS=y CONFIG_LINKINPLUGINS=y
prefix=/usr/local
prefix=/usr
datarootdir = ${prefix}/share
exec_prefix=${prefix}
bindir=${exec_prefix}/bin bindir=${exec_prefix}/bin
datadir=${prefix}/share datadir=${datarootdir}
mandir=${prefix}/share/man mandir=${datarootdir}/man
libdir=${exec_prefix}/lib
LDFLAGS+=-Xlinker -rpath=$(libdir)
TEMPDIR=$(prefix)/tmp
CFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
CXXFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
export MANDIR=$(mandir)/man1 export MANDIR=$(mandir)/man1
ifneq ($(CYGWIN),yes) ifneq ($(WINDOWS),yes)
export CONFDIR=$(datadir)/$(CONFLASTDIR) export CONFDIR=$(libdir)/$(CONFLASTDIR)
HAS_X=y HAS_X=y
else else
# bed under CYGWIN uses windows find file # bed under CYGWIN uses windows find file
export CONFDIR=$(datadir)/$(PROGRAM) export CONFDIR=$(datadir)/$(PROGRAM)
TEMPDIR=$(prefix)/tmp
endif endif
export CONFDIRLINK=$(datadir)/$(PROGRAM) export CONFDIRLINK=$(datadir)/$(PROGRAM)
PERSCONFFILE=~/.$(CONFFILE) PERSCONFFILE=~/.$(CONFFILE)
GLOBALCONFFILE=$(CONFDIRLINK)/$(CONFFILE) GLOBALCONFFILE=$(CONFDIRLINK)/$(CONFFILE)
DEFAULTBEDRCBIN=$(PERSCONFFILE)-bin
else else
prefix=/cygdrive/c prefix=/cygdrive/c
bindir=$(prefix)/windows bindir=$(prefix)/Windows
#bindir=$(FULLWINDIR) datadir=$(prefix)/Program\ Files
datadir="$(prefix)/Program\ Files"
datadir="$(prefix)/Program\ Files"
mandir=$(CONFDIR) mandir=$(CONFDIR)
export MANDIR=$(CONFDIR) export MANDIR=$(CONFDIR)
export CONFDIR=$(datadir)/$(PROGRAM) export CONFDIR=$(datadir)/$(PROGRAM)
export CONFDIRLINK=$(datadir)/$(PROGRAM) export CONFDIRLINK=$(datadir)/$(PROGRAM)
PERSCONFFILE=~/.$(CONFFILE)
PERSCONFFILE=c:/.$(CONFFILE) #BEDRCBINFILE="bedrc-bin" #give only last part in MS Windows is placed in %APPD
#ifeq ($(USERPROFILE),) ATA% if DEFAULTBEDRCBIN not defined
#PERSCONFFILE=c:/.$(CONFFILE)
#else
#PERSCONFFILE="$(USERPROFILE)"/.$(CONFFILE)
#endif
GLOBALCONFFILE=$(datadir)/bed/bedrc GLOBALCONFFILE=$(datadir)/bed/bedrc
CFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\" CFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\"
CXXFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\"
endif
ifeq ($(SYSTEM),Android)
PERSCONFFILE=/sdcard/.$(CONFFILE)
endif endif
CFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\" CFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\"
CXXFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\"
ifneq ($(DEFAULTBEDRCBIN),)
CFLAGS+= -DDEFAULTBEDRCBIN=\"$(DEFAULTBEDRCBIN)\"
CXXFLAGS+= -DDEFAULTBEDRCBIN=\"$(DEFAULTBEDRCBIN)\"
else
ifneq ($(BEDRCBINFILE),)
CFLAGS+=-DBEDRCBINFILE=\"$(BEDRCBINFILE)\"
CXXFLAGS+=-DBEDRCBINFILE=\"$(BEDRCBINFILE)\"
endif
endif
CFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\" CFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\"
export EXEPROGRAM=bed$(EXEEXT) CXXFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\"
export EXEPROGRAM=bed$(HOSTEXEEXT)
exec_prefix=${prefix}
#HAS_MAKEDEPEND=@HAS_MAKEDEPEND@ #HAS_MAKEDEPEND=@HAS_MAKEDEPEND@
export BASEDIR=$(prefix) export BASEDIR=$(prefix)
export XPROGRAM=x$(PROGRAM) export XPROGRAM=x$(PROGRAM)
export BINDIR=$(bindir) export BINDIR=$(bindir)
export CONFVAR=BEDRC export CONFVAR=BEDRC
#s/AC_SUBST(\(.*\))/\1=@\1@ #s/AC_SUBST(\(.*\))/\1=@\1@
EXTRALIBS=
OTHERLIBS=
DYNAMICCURSES=
STATICCURSES=/lib/libcurses.a
CURSESLIB=-lncurses
CFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1
ICONPATH=/usr/share/icons ICONPATH=/usr/share/icons
MENUPATH=/usr/lib/menu MENUPATH=/usr/lib/menu
KDEMENU=/usr/share/applnk KDEMENU=/usr/share/applnk
GNOMEMENU=/usr/share/gnome/apps GNOMEMENU=/usr/share/gnome/apps
BEDMENU=Editors BEDMENU=Editors
XBEDMENU=Utilities XBEDMENU=Utilities
XMENUNAME="bed - binary editor" XMENUNAME="bed - binary editor"
MENUNAME="BED - BINARY EDITOR" MENUNAME="BED - BINARY EDITOR"
DEFINES_H=$(BEDSRCDIR)/src/defines.h DEFINES_H=$(BEDSRCDIR)/src/defines.h
CFLAGS+=-DHAVE_CONFIG_H -DSIZEOF_OFF_T=8 -imacros $(DEFINES_H) CFLAGS+= -DHAVE_CONFIG_H -I$(BEDSRCDIR)/utils -I$(BEDSRCDIR)/x11 -imacros $(DE
CONFIG_XBED=y FINES_H)
NRXVT= rxvt.bin rxvt.sh rxvt-xpm rxvt-xterm CXXFLAGS+= -DHAVE_CONFIG_H -I$(BEDSRCDIR)/utils -I$(BEDSRCDIR)/x11 -imacros $(
RXVT= rxvt DEFINES_H)
#CONFIG_XBED=n
CONFIG_XBED=n
NRXVT= rxvt rxvt.bin rxvt.sh rxvt-xpm rxvt-xterm
RXVT=rxvt
CONFIG_PROGMAN=n CONFIG_PROGMAN=n
GCC=gcc -m32 CROSS_COMPILING=no
CXX=g++ -m32 CC=gcc
CC=$(GCC) CXX=g++
HAS_X=y GXX=$(CXX)
GCC=$(CC)
TOBUILDCC=x86_64-w64-mingw32-gcc
TOBUILDCXX=x86_64-w64-mingw32-g++
HAS_X=n
X_CFLAGS= X_CFLAGS=
X_LIBS= X_LIBS=
X_EXTRA_LIBS= #X_EXTRA_LIBS= -lxcb -lXau -lXdmcp
X_PRE_LIBS= -lSM -lICE X_EXTRA_LIBS= -lxcb -lXau
X_PRE_LIBS=
PDCURSES= PDCURSES=
HAS_FILE=y
USES_ELF=n USES_ELF=n
ELFSIZE=unknown
HAS_NROFF=y HAS_NROFF=y
# *** spaces and tabs matter!!!! *** # *** spaces and tabs matter!!!! ***
#configuration options: #configuration options:
# link static=y # link static=y
CONFIG_STATIC=n CONFIG_STATIC=n
# user threads to go on while making a searchlist. Needs libpthread and ifeq ($(WINDOWS),yes)
# adds instability CONFIG_XBED=n
CONFIG_THREADS=y
THREADSLIB=
ifeq ($(CYGWIN),yes)
CONFIG_THREADS=n
endif endif
# Uses mmap when searching makes searching (forward, casesensitive, # Uses mmap when searching makes searching (forward, casesensitive,
# non regex) maybe a little bit faster. When true around 0.001%. # non regex) maybe a little bit faster. When true around 0.001%.
# and until 0.2.4 it somehow didn't work on extended files # and until 0.2.4 it somehow didn't work on extended files
CONFIG_MMAP=n CONFIG_MMAP=n
# debug -g and making /tmp/bedtrace* and /tmp/beddebug* files. (y=do,m=only -g, n=nodebug, t=only debug files o=only -g -O2) # debug -g and making /tmp/bedtrace* and /tmp/beddebug* files. (y=do,m=only -g, n=nodebug, t=only debug files o=only -g -O2)
CONFIG_DEBUG=m CONFIG_DEBUG=n
#y: offset in long long instead of long (not always supported) #y: offset in long long instead of long (not always supported)
# needed for large harddrives # needed for large harddrives
CONFIG_LARGEFILES=y CONFIG_LARGEFILES=y
# Write the pieces between datatypes and offset numbers # Write the pieces between datatypes and offset numbers
# Objective measures say that doing this makes the screen somehow faster, # Objective measures say that doing this makes the screen somehow faster,
# but my subjective impression is that it becomes slower # but my subjective impression is that it becomes slower
#y: write over with color TEXT which you should define ~/.bedrc or $CONFDIR/bed rc #y: write over with color TEXT which you should define ~/.bedrc or $CONFDIR/bed rc
#n: leave them background #n: leave them background
skipping to change at line 182 skipping to change at line 273
#n: don't do #n: don't do
CONFIG_MENULINES=n CONFIG_MENULINES=n
#color support (depends also on color lines in (.)bedrc) #color support (depends also on color lines in (.)bedrc)
#y: default color, black-white with option -B #y: default color, black-white with option -B
#n: not possible #n: not possible
#o: default black-white, color with option -C #o: default black-white, color with option -C
CONFIG_COLOR=y CONFIG_COLOR=y
ifeq ($(CONFIG_STATIC),y) ifeq ($(CONFIG_STATIC),y)
ifeq (ncurses,ncurses)
CURSESLIB+= -ltinfo -lgpm
endif
CONFIG_PLUGIN=n CONFIG_PLUGIN=n
endif endif
#Plugins can also be linked in the main program #Plugins can also be linked in the main program
#LINKIN: Puts it among other linked in procedures #LINKIN: Puts it among other linked in procedures
#LINKINDYN: shows the linked in plugin like a dynamic one. Can not be put in men u's #LINKINDYN: shows the linked in plugin like a dynamic one. Can not be put in men u's
#Plugins to choice from: bitcontains.plug bitflags.plug duplicate.plug ebcdic2as cii.plug elftables.plug (needs index2table.plug) file.plug filter.plug float.plu g gdb.plug nextitem.plug record.plug signed.plug skip.plug index2table.plug time .plug translate.plug xterm.plug #Plugins to choice from: bitcontains.plug bitflags.plug duplicate.plug ebcdic2as cii.plug elftables.plug (needs index2table.plug) file.plug filter.plug float.plu g gdb.plug nextitem.plug record.plug signed.plug skip.plug index2table.plug time .plug translate.plug xterm.plug
#defaults: #defaults:
# #
ifeq ($(CONFIG_LINKINPLUGINS),) ifeq ($(CONFIG_LINKINPLUGINS),)
ifeq ($(CONFIG_PLUGIN),y) ifeq ($(CONFIG_PLUGIN),y)
CONFIG_LINKINPLUGINS=n CONFIG_LINKINPLUGINS=n
else else
CONFIG_LINKINPLUGINS=y CONFIG_LINKINPLUGINS=y
endif endif
endif endif
ifndef MINIMAL
ifneq ($(CONFIG_LINKINPLUGINS),y) ifneq ($(CONFIG_LINKINPLUGINS),y)
LINKIN+=time.plug signed.plug float.plug bitflags.plug bitcontains.plug duplica te.plug skip.plug nextitem.plug translate.plug LINKIN+=time.plug signed.plug float.plug bitflags.plug bitcontains.plug duplic ate.plug skip.plug nextitem.plug translate.plug
#LINKINDYN+= #LINKINDYN+=
else else
LINKIN+= ebcdic2ascii.plug time.plug signed.plug float.plug bitflags.plug bitcon LINKIN+= ebcdic2ascii.plug time.plug signed.plug float.plug bitflags.plug bitco
tains.plug translate.plug duplicate.plug skip.plug nextitem.plug helpf1.plug ntains.plug translate.plug duplicate.plug skip.plug nextitem.plug helpf1.plug
LINKINDYN+= backward.plug searchclip.plug datatypeinfo.plug cut.plug undoall.plu LINKINDYN+= backward.plug searchclip.plug datatypeinfo.plug cut.plug undoall.plu
g g multiply.plug
ifneq ($(CYGWIN),yes) ifneq ($(WINDOWS),yes)
ifeq ($(HAS_X),y) #ifeq ($(HAS_X),y)
LINKINDYN+=title.plug putselect.plug switchsize.plug rxvt.plug LINKINDYN+=title.plug #putselect.plug switchsize.plug rxvt.plug
endif # OTHERLIBS+= $(THREADSLIB) #for putselect.plug
#endif
endif endif
ifeq ($(FULLUNIX),y) ifeq ($(FULLUNIX),y)
LINKINDYN+=disass.plug filter.plug UNIXPLUGINS=y
endif endif
ifeq ($(HAS_FILE),y) ifeq ($(UNIXPLUGINS),y)
LINKINDYN+= file.plug #LINKINDYN+=disass.plug filter.plug
LINKINDYN+=filter.plug
endif
ifeq ($(HAVE_MAGIC_H),1)
LINKINDYN+= magic.plug
OTHERLIBS+= -lmagic #-lz
REMOVEPLUG+= file.plug
else
REMOVEPLUG+= magic.plug
ifeq ($(HAS_FILE),y)
LINKINDYN+= file.plug
endif
endif endif
ifeq ($(UNIXPLUGINS),y)
ifeq ($(USES_ELF),y) ifeq ($(USES_ELF),y)
LINKINDYN+=index2table.plug elftables.plug #LINKINDYN+=index2table.plug
endif
ifeq ($(ELFSIZE),32)
#LINKINDYN+=elftables32.plug
endif
endif endif
endif endif
ifeq ($(CYGWIN),yes) ifeq ($(WINDOWS),yes)
LINKIN+=clipboard.plug title.plug LINKIN+=clipboard.plug title.plug
ifeq (ncurses,ncurses)
LINKINDYN+=rxvt.plug
endif
endif endif
endif # MINIMAL
LINKIN+=edit.plug # if left out edit src/menu.h LINKIN+=edit.plug # if left out edit src/menu.h
INLINKLIB=inlink.a INLINKLIB=inlink.a
CFLAGS+=-DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDIR #CFLAGS+=-DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI
)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFVA R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV
R)\" -DCONFFILE=\"$(CONFFILE)\" AR)\" -DCONFFILE=\"$(CONFFILE)\"
CFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI
R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV
AR)\" -DCONFFILE=\"$(CONFFILE)\"
CXXFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONF
DIR)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CON
FVAR)\" -DCONFFILE=\"$(CONFFILE)\"
INLINKALL=$(LINKIN) $(LINKINDYN)
ifeq ($(CROSS_COMPILING),no)
TOBUILDCXXFLAGS=$(CXXFLAGS)
TOBUILDCFLAGS=$(CFLAGS)
TOBUILDLDFLAGS=$(LDFLAGS)
endif
ifeq ($(HOST_OS),mingw32)
CFLAGS+=-D_POSIX_THREAD_SAFE_FUNCTIONS=1
CXXFLAGS+=-D_POSIX_THREAD_SAFE_FUNCTIONS=1
endif
endif endif
 End of changes. 47 change blocks. 
82 lines changed or deleted 216 lines changed or added

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