From c89255974b4b49e7027fbd57170b5f824d94f961 Mon Sep 17 00:00:00 2001 From: bernhardheld Date: Thu, 11 May 2006 20:06:55 +0000 Subject: [PATCH] * packihx/, * configure.in, * configure, * sdcc.dsw, * Makefile.bcc, * Makefile.in, * support/packihx/Makefile.in, * support/packihx/clean.mk, * support/packihx/Makefile.bcc, * support/packihx/PackIhx.dsp: moved packihx to support/packihx git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4166 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 13 +++++++++++++ Makefile.bcc | 2 +- Makefile.in | 2 +- configure | 4 ++-- configure.in | 2 +- sdcc.dsw | 2 +- {packihx => support/packihx}/Makefile.bcc | 2 +- {packihx => support/packihx}/Makefile.in | 2 +- {packihx => support/packihx}/PackIhx.dsp | 8 ++++---- {packihx => support/packihx}/clean.mk | 2 +- {packihx => support/packihx}/config_in.h | 0 {packihx => support/packihx}/configure | 0 {packihx => support/packihx}/configure.in | 0 {packihx => support/packihx}/packihx.c | 0 14 files changed, 26 insertions(+), 13 deletions(-) rename {packihx => support/packihx}/Makefile.bcc (89%) rename {packihx => support/packihx}/Makefile.in (97%) rename {packihx => support/packihx}/PackIhx.dsp (92%) rename {packihx => support/packihx}/clean.mk (72%) rename {packihx => support/packihx}/config_in.h (100%) rename {packihx => support/packihx}/configure (100%) rename {packihx => support/packihx}/configure.in (100%) rename {packihx => support/packihx}/packihx.c (100%) diff --git a/ChangeLog b/ChangeLog index 3380536a..baa90c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-05-11 Bernhard Held + + * packihx/, + * configure.in, + * configure, + * sdcc.dsw, + * Makefile.bcc, + * Makefile.in, + * support/packihx/Makefile.in, + * support/packihx/clean.mk, + * support/packihx/Makefile.bcc, + * support/packihx/PackIhx.dsp: moved packihx to support/packihx + 2006-05-11 Erik Petrich * src/SDCCval.c (valNot): fix for regression test failure diff --git a/Makefile.bcc b/Makefile.bcc index 0428a19b..a6ef9cbd 100644 --- a/Makefile.bcc +++ b/Makefile.bcc @@ -29,7 +29,7 @@ sdcc: cd .. packihx: - cd packihx + cd support\packihx make -f Makefile.bcc cd .. diff --git a/Makefile.in b/Makefile.in index 380db751..72c60ff6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ SDCC_DOC = doc # Parts that are not normally compiled but need to be cleaned SDCC_EXTRA = support/regression -SDCC_PACKIHX = packihx +SDCC_PACKIHX = support/packihx SDCC_LIBRARIAN = support/librarian ifeq ($(OPT_DISABLE_HC08), 0) diff --git a/configure b/configure index c3ac6041..2aa7c97e 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all support/cpp2" -ac_subdirs_all="$ac_subdirs_all packihx" +ac_subdirs_all="$ac_subdirs_all support/packihx" ac_subdirs_all="$ac_subdirs_all sim/ucsim" ac_subdirs_all="$ac_subdirs_all device/lib/pic" ac_subdirs_all="$ac_subdirs_all device/lib/pic16" @@ -7862,7 +7862,7 @@ subdirs="$subdirs support/cpp2" test $OPT_DISABLE_PACKIHX = 0 && -subdirs="$subdirs packihx" +subdirs="$subdirs support/packihx" test $OPT_DISABLE_UCSIM = 0 && diff --git a/configure.in b/configure.in index 01e63145..993a3520 100755 --- a/configure.in +++ b/configure.in @@ -628,7 +628,7 @@ mv ports ports.build # Generating output files # =========================================================================== test $OPT_DISABLE_SDCPP = 0 && AC_CONFIG_SUBDIRS(support/cpp2) -test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(packihx) +test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(support/packihx) test $OPT_DISABLE_UCSIM = 0 && AC_CONFIG_SUBDIRS(sim/ucsim) AC_CONFIG_FILES([doc/Makefile]) diff --git a/sdcc.dsw b/sdcc.dsw index ae524eec..b5846652 100644 --- a/sdcc.dsw +++ b/sdcc.dsw @@ -300,7 +300,7 @@ Package=<4> ############################################################################### -Project: "packihx"=.\packihx\PackIhx.dsp - Package Owner=<4> +Project: "packihx"=.\support\packihx\PackIhx.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/packihx/Makefile.bcc b/support/packihx/Makefile.bcc similarity index 89% rename from packihx/Makefile.bcc rename to support/packihx/Makefile.bcc index 8da1b594..03dbddc2 100644 --- a/packihx/Makefile.bcc +++ b/support/packihx/Makefile.bcc @@ -1,6 +1,6 @@ # Makefile for Borlad C++ -PRJDIR = .. +PRJDIR = ../.. !include $(PRJDIR)/Bcc.inc diff --git a/packihx/Makefile.in b/support/packihx/Makefile.in similarity index 97% rename from packihx/Makefile.in rename to support/packihx/Makefile.in index 137a7d63..7711e971 100644 --- a/packihx/Makefile.in +++ b/support/packihx/Makefile.in @@ -1,4 +1,4 @@ -PRJDIR = .. +PRJDIR = ../.. VPATH = @srcdir@ srcdir = @srcdir@ top_builddir = @top_builddir@ diff --git a/packihx/PackIhx.dsp b/support/packihx/PackIhx.dsp similarity index 92% rename from packihx/PackIhx.dsp rename to support/packihx/PackIhx.dsp index ed37f561..42efd44f 100644 --- a/packihx/PackIhx.dsp +++ b/support/packihx/PackIhx.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\packihx.exe" /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\packihx.exe" /pdbtype:sept +# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin_vc\packihx.exe" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin_vc\packihx.exe" /pdbtype:sept !ELSEIF "$(CFG)" == "packihx - Win32 Release" @@ -74,8 +74,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\packihx.exe" /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\packihx.exe" /pdbtype:sept +# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\bin_vc\packihx.exe" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\..\bin_vc\packihx.exe" /pdbtype:sept !ENDIF diff --git a/packihx/clean.mk b/support/packihx/clean.mk similarity index 72% rename from packihx/clean.mk rename to support/packihx/clean.mk index d0469ea5..16dd176f 100644 --- a/packihx/clean.mk +++ b/support/packihx/clean.mk @@ -1,7 +1,7 @@ clean: rm -f *core *[%~] *.[oa] *.output rm -f .[a-z]*~ \#* - rm -f $(top_builddir)bin/packihx$(EXEEXT) + rm -f $(TARGET) distclean realclean: clean rm -f config.* Makefile diff --git a/packihx/config_in.h b/support/packihx/config_in.h similarity index 100% rename from packihx/config_in.h rename to support/packihx/config_in.h diff --git a/packihx/configure b/support/packihx/configure similarity index 100% rename from packihx/configure rename to support/packihx/configure diff --git a/packihx/configure.in b/support/packihx/configure.in similarity index 100% rename from packihx/configure.in rename to support/packihx/configure.in diff --git a/packihx/packihx.c b/support/packihx/packihx.c similarity index 100% rename from packihx/packihx.c rename to support/packihx/packihx.c -- 2.30.2