X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.common.in;h=5f73360c682764904a39372c9be38a3b7f16b8cc;hb=81096b2cb05e1aa87dec1b0a02d11754f7f1ed6d;hp=eb8abd765338eee9836471ead0d0dc626857d230;hpb=358bb36a50196d00ce93614ea02553cd1743e5e4;p=fw%2Fsdcc

diff --git a/Makefile.common.in b/Makefile.common.in
index eb8abd76..5f73360c 100644
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -14,7 +14,7 @@ CC		= @CC@
 CPP		= @CPP@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL@
-YACC            = @YACC@ 
+YACC            = @YACC@
 LEX             = @LEX@ 
 AWK             = @AWK@
 STRIP           = @STRIP@
@@ -28,26 +28,43 @@ mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @infodir@
-srcdir          = @srcdir@
-docdir          = @datadir@/doc
+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@
+
+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			= $(PRJDIR)/support/Util
+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          = @CFLAGS@ -Wall
+DEFS           += $(subs -DHAVE_CONFIG_H,,@DEFS@)
+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