[complement-svn] SF.net SVN: complement: [1490] trunk/complement/explore/Makefiles

[<com...@us...>]

Revision: 1490
          http://svn.sourceforge.net/complement/?rev=1490&view=rev
Author:   complement
Date:     2007-01-31 03:45:23 -0800 (Wed, 31 Jan 2007)

Log Message:
-----------
PRGNAME may be omitted, if PRGNAMES present

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/app/macro.mak
    trunk/complement/explore/Makefiles/top.mak

Added Paths:
-----------
    trunk/complement/explore/Makefiles/ut/app2-mult/
    trunk/complement/explore/Makefiles/ut/app2-mult/Makefile
    trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc
    trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc
    trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc
    trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc

Modified: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak	2007-01-31 08:03:15 UTC (rev 1489)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak	2007-01-31 11:45:23 UTC (rev 1490)
@@ -1,6 +1,6 @@
 # Time-stamp: <06/11/16 23:37:38 ptr>
 #
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
 # Petr Ovtchenkov
 #
 # Portion Copyright (c) 1999-2001
@@ -9,10 +9,16 @@
 # Licensed under the Academic Free License version 3.0
 #
 
-ALLPRGS = 
-ALLPRGS_DBG =
-ALLPRGS_STLDBG =
+ifdef PRGNAME
+PRG        := $(OUTPUT_DIR)/${PRGNAME}${EXE}
+PRG_DBG    := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
+PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
+endif
 
+ALLPRGS = ${PRG}
+ALLPRGS_DBG = ${PRG_DBG}
+ALLPRGS_STLDBG = ${PRG_STLDBG}
+
 define prog_prog
 $(1)_PRG        := $(OUTPUT_DIR)/$(1)${EXE}
 $(1)_PRG_DBG    := $(OUTPUT_DIR_DBG)/$(1)${EXE}
@@ -25,8 +31,4 @@
 
 $(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
 
-PRG        := $(OUTPUT_DIR)/${PRGNAME}${EXE}
-PRG_DBG    := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
-PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
-
 LDFLAGS += ${LDSEARCH}

Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak	2007-01-31 08:03:15 UTC (rev 1489)
+++ trunk/complement/explore/Makefiles/top.mak	2007-01-31 11:45:23 UTC (rev 1490)
@@ -109,10 +109,10 @@
 # if target is program, rules for executable
 ifdef PRGNAME
 include ${RULESBASE}/$(USE_MAKE)/app/top.mak
-endif
-
+else
 ifdef PRGNAMES
-# include ${RULESBASE}/$(USE_MAKE)/app/top.mak
+include ${RULESBASE}/$(USE_MAKE)/app/top.mak
 endif
+endif
 
 .PHONY: $(PHONY)


Property changes on: trunk/complement/explore/Makefiles/ut/app2-mult
___________________________________________________________________
Name: svn:ignore
   + obj


Added: trunk/complement/explore/Makefiles/ut/app2-mult/Makefile
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/Makefile	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/Makefile	2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,38 @@
+# -*- Makefile -*- Time-stamp: <06/11/13 23:03:45 ptr>
+
+SRCROOT := ../../..
+
+# EXTRA_POST := check-release-shared
+# EXTRA_POST_DBG := check-dbg-shared
+# EXTRA_POST_STLDBG := check-stldbg-shared
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/top.mak
+
+ifndef WITHOUT_STLPORT
+LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}
+endif
+
+check:	check-release-shared check-dbg-shared check-stldbg-shared
+
+check-release-shared:	release-shared
+	@echo Running 2 test cases...
+	@file ${test2_PRG} | grep ELF >/dev/null || exit 1
+	@file ${test3_PRG} | grep ELF >/dev/null || exit 1
+	@echo "*** No errors detected"
+
+check-dbg-shared:	dbg-shared
+	@echo Running 2 test cases...
+	@file ${test2_PRG_DBG} | grep ELF >/dev/null || exit 1
+	@file ${test3_PRG_DBG} | grep ELF >/dev/null || exit 1
+	@echo "*** No errors detected"
+
+ifndef WITHOUT_STLPORT
+check-stldbg-shared:	stldbg-shared
+	@echo Running 2 test cases...
+	@file ${test2_PRG_STLDBG} | grep ELF >/dev/null || exit 1
+	@file ${test3_PRG_STLDBG} | grep ELF >/dev/null || exit 1
+	@echo "*** No errors detected"
+endif
+
+PHONY += check check-release-shared check-dbg-shared check-stldbg-shared

Added: trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc	2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,7 @@
+# -*- makefile -*- Time-stamp: <04/01/12 15:37:40 ptr>
+
+PRGNAMES = test2 test3
+#SRC_C = test.c
+SRC_CC = test.cc
+test2_SRC_CC = test2.cc
+test3_SRC_CC = test3.cc test31.cc

Added: trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc	2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int main()
+{
+  return 2;
+}

Added: trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc	2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int main()
+{
+  return 3;
+}

Added: trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc	2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int f()
+{
+  return 3;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.