* configure.in, configure, Makefile.in, Makefile.bcc:

  adapted for moved cpp2

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5134 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 8e761d27724f3429532c7f0bed3ad37a7ad9a8da..4d1b44bb2600a432c85d82d595c8f528cc75314b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
          support/cpp2/libcpp/lex.c, support/cpp2/libcpp/system.h,
          support/cpp2/libcpp/charset.c: SDCPP synchronized with GCC CPP
          release version 4.3.0
+       * configure.in, configure, Makefile.in, Makefile.bcc:
+         adapted for moved cpp2
 
 2008-03-31 Frieder Ferlemann <Frieder.Ferlemann AT web.de>
 

diff --git a/Makefile.bcc b/Makefile.bcc
index a6ef9cbd0daaacff62e9315bb4d7684c0a321069..366958af9ef0f904295f12477f1953dbf19a793c 100644 (file)
--- a/Makefile.bcc
+++ b/Makefile.bcc
@@ -1,6 +1,6 @@
 # Makefile for Borlad C++
 
-all: config asx8051 as-z80 sdcc packihx cpp2
+all: config asx8051 as-z80 sdcc packihx cpp
 
 
 config: sdcc_vc.h
@@ -18,8 +18,8 @@ as-z80:
         make -f Makefile.bcc
         cd ..\..
 
-cpp2:
-        cd support\cpp2
+cpp:
+        cd support\cpp
         make -f Makefile.bcc
         cd ..\..
 

diff --git a/Makefile.in b/Makefile.in
index 6610643c6d058d19fe56e73a3876e723aca9900d..0cf60ef7e3484ab0b20775c19627d050dfde15fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ endif
 PKGS            += $(SDCC_DOC)
 
 ifeq ($(OPT_DISABLE_SDCPP), 0)
-SDCC_LIBS       += support/cpp2
+SDCC_LIBS       += support/cpp
 endif
 
 TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-aslink sdcc-librarian

diff --git a/configure b/configure
index 3292299889784d73582c4eb773617bfc668cb68b..3ca266fe37edae8ae1ce3257dc3a9ef995a33a7e 100755 (executable)
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ sdccconf_h_dir_separator
 include_dir_suffix
 lib_dir_suffix
 docdir'
-ac_subdirs_all='support/cpp2
+ac_subdirs_all='support/cpp
 support/packihx
 sim/ucsim
 debugger/mcs51
@@ -7598,7 +7598,7 @@ mv ports ports.build
 
 # Generating output files
 # ===========================================================================
-test $OPT_DISABLE_SDCPP   = 0 && subdirs="$subdirs support/cpp2"
+test $OPT_DISABLE_SDCPP   = 0 && subdirs="$subdirs support/cpp"
 
 test $OPT_DISABLE_PACKIHX = 0 && subdirs="$subdirs support/packihx"
 

diff --git a/configure.in b/configure.in
index 735fafb17de753f7a845c228645c590eb612850f..fb1485f50c7716cfbf0dba8e1a5270b606ecba2d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -700,7 +700,7 @@ mv ports ports.build
 
 # Generating output files
 # ===========================================================================
-test $OPT_DISABLE_SDCPP   = 0 && AC_CONFIG_SUBDIRS(support/cpp2)
+test $OPT_DISABLE_SDCPP   = 0 && AC_CONFIG_SUBDIRS(support/cpp)
 test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(support/packihx)
 test $OPT_DISABLE_UCSIM   = 0 && AC_CONFIG_SUBDIRS(sim/ucsim)
 test $OPT_DISABLE_SDCDB   = 0 && AC_CONFIG_SUBDIRS(debugger/mcs51)