X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.common.in;h=ead4027541c2a70951dce06764011959b5432e84;hb=3bd25d75bcad68055bb616dcc29dde8a2965965e;hp=8f8b71900bfc857ecc45d614a5415a7b33bb2bf2;hpb=31e09b642b8a7972c9103cef57fbd01227fbe3cb;p=fw%2Fsdcc

diff --git a/Makefile.common.in b/Makefile.common.in
index 8f8b7190..ead40275 100644
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -3,6 +3,7 @@
 #
 
 # Version
+PACKAGE         = @PACKAGE@
 VERSION         = @VERSION@
 VERSIONHI       = @VERSIONHI@
 VERSIONLO       = @VERSIONLO@
@@ -10,12 +11,12 @@ VERSIONP        = @VERSIONP@
 
 # Programs
 SHELL		= /bin/sh
-CC		= @CC@
-CPP		= @CPP@
+CC		= @CCACHE@ @CC@
+CPP		= @CCACHE@ @CPP@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL@
 YACC            = @YACC@
-LEX             = @LEX@ 
+LEX             = @LEX@
 AWK             = @AWK@
 STRIP           = @STRIP@
 prefix          = @prefix@
@@ -23,35 +24,49 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @infodir@
-srcdir          = @srcdir@
 docdir          = @docdir@
+DESTDIR         =
 
 include_dir_suffix = @include_dir_suffix@
 lib_dir_suffix     = @lib_dir_suffix@
 
 # Modules to enable/disable
-OPT_ENABLE_UCSIM = @OPT_ENABLE_UCSIM@
-OPT_ENABLE_DEVICE_LIB_BUILD = @OPT_ENABLE_DEVICE_LIB_BUILD@
-OPT_ENABLE_PACKIHX = @OPT_ENABLE_PACKIHX@
+OPT_DISABLE_AVR   = @OPT_DISABLE_AVR@
+OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
+OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
+OPT_DISABLE_HC08  = @OPT_DISABLE_HC08@
+OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
+OPT_DISABLE_PIC   = @OPT_DISABLE_PIC@
+OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
+OPT_DISABLE_XA51  = @OPT_DISABLE_XA51@
+OPT_DISABLE_Z80   = @OPT_DISABLE_Z80@
 
-SLIB			= $(PRJDIR)/support/Util
+OPT_DISABLE_UCSIM     = @OPT_DISABLE_UCSIM@
+OPT_DISABLE_DEVICE_LIB= @OPT_DISABLE_DEVICE_LIB@
+OPT_DISABLE_PACKIHX   = @OPT_DISABLE_PACKIHX@
+OPT_ENABLE_DOC        = @OPT_ENABLE_DOC@
+OPT_DISABLE_SDCPP     = @OPT_DISABLE_SDCPP@
 
+SLIB			= $(top_builddir)/support/Util
+
+EXEEXT          = @EXEEXT@
 transform       = @program_transform_name@
 
 # Flags
 
-DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
-CPPFLAGS        = $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
-CFLAGS          = -Wall @CFLAGS@
-LDFLAGS         = @LDFLAGS@
+DEFS           += $(subs -DHAVE_CONFIG_H,,@DEFS@)
+CPPFLAGS       += @CPPFLAGS@ $(INCLUDEFLAGS) -I. -I$(top_builddir) -I$(srcdir)/$(SLIB) -I$(srcdir)
+CFLAGS         += -Wall @CFLAGS@
+LDFLAGS        += @LDFLAGS@
 M_OR_MM         = @M_OR_MM@
 
-EXTRALIBS	= @LIBS@
+EXTRALIBS      += @LIBS@
 
 # Shared settings between all the sub Makefiles
 # Done here so that we don't have to start a Make from the top levelport