diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-07 17:32:14 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-07 17:32:14 +0000 |
| commit | 784fe453b13e068e3ec273b9a0f4021ac5a51e96 (patch) | |
| tree | c8b12e59e3532e2d5e6cc8ab7ef19788ccd4cd7c | |
| parent | d519149594318e5062421a1b6004b37816216976 (diff) | |
| download | ATCD-784fe453b13e068e3ec273b9a0f4021ac5a51e96.tar.gz | |
ChangeLogTag: Mon Jul 7 12:31:40 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm | 2 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/make.mpd | 12 |
3 files changed, 27 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index a57811d3835..50d56e6741a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,18 @@ +Mon Jul 7 12:31:40 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm: + * bin/MakeProjectCreator/templates/make.mpd: + + Added a 'depend' target and fixed the default library installation + target. + Sun Jul 6 09:55:16 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * ace/Task.cpp: Fixed compile errors with MSVC 7.1 when - ACE_HAS_ANSI_CAST and RTTI is turned on. Thanks to Marek Brudka - <M.Brudka@elka.pw.edu.pl> for providing the patch. + * ace/Task.cpp: Fixed compile errors with MSVC 7.1 when + ACE_HAS_ANSI_CAST and RTTI is turned on. Thanks to Marek Brudka + <M.Brudka@elka.pw.edu.pl> for providing the patch. - * THANKS: Added Marek to the hall of fame. + * THANKS: Added Marek to the hall of fame. Sat Jul 5 06:57:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> @@ -14,8 +22,8 @@ Fri Jul 4 17:05:39 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> * include/makeinclude/ace_flags.bor: - Added the TAO_RTSCHEDULER_CFLAGS flag to build RTSCheduler - library using Borland compiler. + Added the TAO_RTSCHEDULER_CFLAGS flag to build RTSCheduler + library using Borland compiler. Fri Jul 4 07:29:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> @@ -37,8 +45,8 @@ Thu Jul 3 22:05:58 UTC 2003 Don Hinton <dhinton@dresystems.com> Thu Jul 03 17:00:47 2003 Nanbor Wang <nanbor@cs.wustl.edu> - * bin/MakeProjectCreator/config/ciao_client.mpb: Added "security" - as one of the depending library for all CIAO clients. + * bin/MakeProjectCreator/config/ciao_client.mpb: Added "security" + as one of the depending library for all CIAO clients. Thu Jul 3 13:15:17 2003 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm index 99675f875fc..42bd851bd23 100644 --- a/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm @@ -69,7 +69,7 @@ sub write_comps { ## Print out the projet Makefile print $fh $crlf . - "all clean realclean:$crlf"; + "all clean depend realclean:$crlf"; ## If there is more than one project, use a for loop if ($#list > 0) { diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd index 179c0cfb8bd..d0eac06edec 100644 --- a/bin/MakeProjectCreator/templates/make.mpd +++ b/bin/MakeProjectCreator/templates/make.mpd @@ -7,6 +7,7 @@ CXX = <%cxx%> <%endfor%> CCC = $(CXX) MAKEFILE = <%project_file%> +DEPENDENCIES = .depend.<%project_file%> <%if(exename)%> BIN = <%exename%> <%endif%> @@ -148,8 +149,7 @@ INSTARGET = $(LIB) <%endif%> install: @mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" - @$(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)" - @ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" + @[ -f "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)" ] || ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" <%endif%> <%endif%> clean: @@ -164,4 +164,12 @@ realclean: clean #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- + +$(DEPENDENCIES): + touch $(DEPENDENCIES) + +depend: + perl <%depgen("$(ACE_ROOT)/bin/depgen.pl")%> -t gnu<%foreach(includes)%> -I<%include%><%endfor%><%foreach(macros)%> -D<%macro%><%endfor%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f $(DEPENDENCIES)<%foreach(source_files)%> <%source_file%><%endfor%> + +include $(DEPENDENCIES) <%marker(bottom)%> |