luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected .gitignore to ignore files from configuration (defs.mak, 

config.log, etc.).  Not sure that is working properly with gitocd
since "defs.mak" was already in the .gitignore file but it queued
for commit.
This commit is contained in:
Tim Edwards 2017-08-23 13:55:40 -04:00
parent ae3b76dfd6
commit 38dfe61dbb
5 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,6 +2,9 @@ defs.mak
Depend Depend
config.cache config.cache
config.log config.log
scripts/config.log
scripts/config.status
scripts/defs.mak
*.o *.o
*.so *.so
*~ *~

4
defs.mak
View File

@ -59,14 +59,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 0 MAGIC_REVISION = 13
CC = gcc CC = gcc
CPP = /scripts/preproc.py CPP = /scripts/preproc.py
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} CPPFLAGS = -I. -I${MAGICDIR}
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"0\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\" DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"13\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC

34
scripts/config.log
View File

@ -12,9 +12,9 @@ generated by GNU Autoconf 2.69. Invocation command line was
hostname = stravinsky hostname = stravinsky
uname -m = x86_64 uname -m = x86_64
uname -r = 3.18.3-201.fc21.x86_64 uname -r = 4.1.13-100.fc21.x86_64
uname -s = Linux uname -s = Linux
uname -v = #1 SMP Mon Jan 19 15:59:31 UTC 2015 uname -v = #1 SMP Tue Nov 10 13:13:20 UTC 2015
/usr/bin/uname -p = x86_64 /usr/bin/uname -p = x86_64
/bin/uname -X = unknown /bin/uname -X = unknown
@ -125,7 +125,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3469: result: gcc -E configure:3469: result: gcc -E
@ -146,7 +146,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3589: checking for g++ configure:3589: checking for g++
@ -292,7 +292,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -332,7 +332,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -392,7 +392,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -432,7 +432,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -473,7 +473,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -514,7 +514,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -582,7 +582,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -623,7 +623,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -726,7 +726,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -788,7 +788,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -956,7 +956,7 @@ CPPFLAGS=''
CSH='/bin/csh' CSH='/bin/csh'
CXX='g++' CXX='g++'
CXXFLAGS='-g -O2' CXXFLAGS='-g -O2'
DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"0\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1' DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"13\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
DEPEND_FLAG='-MM' DEPEND_FLAG='-MM'
ECHO_C='' ECHO_C=''
ECHO_N='printf' ECHO_N='printf'
@ -979,7 +979,7 @@ LIBOBJS=''
LIBS='-lcairo -lGLU -lGL ' LIBS='-lcairo -lGLU -lGL '
LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6' LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
LTLIBOBJS='' LTLIBOBJS=''
MAGIC_REVISION='0' MAGIC_REVISION='13'
MAGIC_VERSION='8.2' MAGIC_VERSION='8.2'
OA='' OA=''
OA_LIBS='' OA_LIBS=''
@ -1078,7 +1078,7 @@ unused=' readline lisp'
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_URL "" #define PACKAGE_URL ""
#define MAGIC_VERSION "8.2" #define MAGIC_VERSION "8.2"
#define MAGIC_REVISION "0" #define MAGIC_REVISION "13"
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1

12
scripts/config.status
View File

@ -588,7 +588,7 @@ S["INSTALL_TARGET"]="install-tcl"
S["ALL_TARGET"]="tcl" S["ALL_TARGET"]="tcl"
S["OA_LIBS"]="" S["OA_LIBS"]=""
S["OA"]="" S["OA"]=""
S["MAGIC_REVISION"]="0" S["MAGIC_REVISION"]="13"
S["MAGIC_VERSION"]="8.2" S["MAGIC_VERSION"]="8.2"
S["LD_RUN_PATH"]="" S["LD_RUN_PATH"]=""
S["SHLIB_CFLAGS"]="-Wimplicit-int -fPIC" S["SHLIB_CFLAGS"]="-Wimplicit-int -fPIC"
@ -671,11 +671,11 @@ S["ECHO_T"]=""
S["ECHO_N"]="-n" S["ECHO_N"]="-n"
S["ECHO_C"]="" S["ECHO_C"]=""
S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\ S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\
"\\\"8.2\\\" -DMAGIC_REVISION=\\\"0\\\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DH"\ "\\\"8.2\\\" -DMAGIC_REVISION=\\\"13\\\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -D"\
"AVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG="\ "HAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG"\
"8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFIL"\ "=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFI"\
"E_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -D"\ "LE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -"\
"HAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1" "DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1"
S["mandir"]="${datarootdir}/man" S["mandir"]="${datarootdir}/man"
S["localedir"]="${datarootdir}/locale" S["localedir"]="${datarootdir}/locale"
S["libdir"]="${exec_prefix}/lib" S["libdir"]="${exec_prefix}/lib"

4
scripts/defs.mak
View File

@ -59,14 +59,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 0 MAGIC_REVISION = 13
CC = gcc CC = gcc
CPP = /scripts/preproc.py CPP = /scripts/preproc.py
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} CPPFLAGS = -I. -I${MAGICDIR}
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"0\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\" DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"13\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC