X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.common.in;h=cd285a4e6b3e42a5ec026d77ff53e72a027fef90;hb=65413e60bfc6d3816772cd3cf8d6dc6597a18a2e;hp=405c8bb026ae9fdd6e5cf9003545a9a00e361bdf;hpb=fde3bdeec158662ea4c139a20b325135d69b79bf;p=fw%2Fsdcc

diff --git a/Makefile.common.in b/Makefile.common.in
index 405c8bb0..cd285a4e 100644
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -23,23 +23,36 @@ 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@
@@ -47,7 +60,7 @@ transform       = @program_transform_name@
 # Flags
 
 DEFS           += $(subs -DHAVE_CONFIG_H,,@DEFS@)
-CPPFLAGS       += $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
+CPPFLAGS       += @CPPFLAGS@ $(INCLUDEFLAGS) -I. -I$(top_builddir) -I$(srcdir)/$(SLIB) -I$(srcdir)
 CFLAGS         += -Wall @CFLAGS@
 LDFLAGS        += @LDFLAGS@
 M_OR_MM         = @M_OR_MM@