Enabled VPATH feature: changed nearly all Makefiles (149 files).

[fw/sdcc] / Makefile.common.in

diff --git a/Makefile.common.in b/Makefile.common.in
index 90d0edcbae3ed1190bfe8ec5fa5ab990691fd7b3..5f73360c682764904a39372c9be38a3b7f16b8cc 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -28,29 +28,43 @@ 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@
+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