Author: tabish
Date: Fri Sep 11 18:01:43 2009
New Revision: 813960
URL: http://svn.apache.org/viewvc?rev=813960&view=rev
Log:
Updated with better install section and removed the ifdef for makefiles
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/Makefile.win
Modified: activemq/activemq-cpp/trunk/activemq-cpp/Makefile.win
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.win?rev=813960&r1=813959&r2=813960&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/Makefile.win (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/Makefile.win Fri Sep 11 18:01:43
2009
@@ -1,20 +1,3 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-#
# Makefile.win for Win32 ActiveMQ-CPP
#
# Targets are:
@@ -64,6 +47,8 @@
USEMAK=1
!ENDIF
+CONFIGS="Release ReleaseDLL Debug DebugDLL"
+
PREFIX=..\ActiveMQ-CPP
CONFIG=Release
VERBOCITY=Normal
@@ -88,18 +73,6 @@
all: build check
-!IF $(USEMAK) == 1
-
-clean:
- $(MAKE) $(MAKEOPT) -f Makefile.win ARCH="$(ARCH)" \
- CTARGET=CLEAN build
-
-build:
- $(MAKE) $(MAKEOPT) -f activemq-cpp.mak CFG="activemq - $(ARCH)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libactivemq-cpp.mak CFG="libactivemq -
$(ARCH)" RECURSE=0 $(CTARGET)
-
-!ELSEIF $(USESLN) == 1
-
clean:
cd vs2005-build
-msbuild vs2005-activemq-cpp.sln /t:vs2005-activemq:Clean
/p:Configuration=$(CONFIG);Platform=$(ARCH) /verbosity:$(VERBOCITY)
@@ -116,9 +89,6 @@
-msbuild vs2005-activemq-cpp.sln /t:vs2005-activemq-unittests
/p:Configuration=$(CONFIG);Platform=$(ARCH)
cd ..
-!ENDIF
-
-
checkamq:
cd vs2005-build\$(CONFIG)
.\vs2005-activemq-unittests.exe
@@ -138,12 +108,12 @@
copy NOTICE.txt "$(PREFIX)\NOTICE.txt" <.y
xcopy src\main\*.h "$(PREFIX)\include\" /s /d < .a
!IF "$(CONFIG)" == "Debug" || "$(CONFIG)" == "Release"
- copy .\vs2005-build\$(CONFIG)\libactivemq-cpp$(POSTFIX).lib
"$(PREFIX)\lib\" <.y
+ copy .\vs2005-build\$(ARCH)\$(CONFIG)\libactivemq-cpp$(POSTFIX).lib
"$(PREFIX)\lib\" <.y
!ELSE
- copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).lib
"$(PREFIX)\lib\" <.y
- copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).exp
"$(PREFIX)\lib\" <.y
- copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).dll
"$(PREFIX)\bin\" <.y
- copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).pdb
"$(PREFIX)\bin\" <.y
+ copy .\vs2005-build\$(ARCH)\$(CONFIG)\activemq-cpp$(POSTFIX).lib
"$(PREFIX)\lib\" <.y
+ copy .\vs2005-build\$(ARCH)\$(CONFIG)\activemq-cpp$(POSTFIX).exp
"$(PREFIX)\lib\" <.y
+ copy .\vs2005-build\$(ARCH)\$(CONFIG)\activemq-cpp$(POSTFIX).dll
"$(PREFIX)\bin\" <.y
+ copy .\vs2005-build\$(ARCH)\$(CONFIG)\activemq-cpp$(POSTFIX).pdb
"$(PREFIX)\bin\" <.y
!ENDIF
del .y
del .a
