From 85cb3f04252b0228830903b21c08bb64e9919c18 Mon Sep 17 00:00:00 2001
From: geronimo <geronimo013@gmx.de>
Date: Sun, 29 Jul 2012 15:11:47 +0200
Subject: changed server setup to config file, little rearrangement of sources

---
 libs/util/nbproject/Makefile-Debug.mk          | 12 ++++++++++--
 libs/util/nbproject/Makefile-Release.mk        |  6 ++++++
 libs/util/nbproject/configurations.xml         | 19 +++++++++++++++++--
 libs/util/nbproject/private/configurations.xml |  2 +-
 libs/util/nbproject/project.xml                |  4 +++-
 5 files changed, 37 insertions(+), 6 deletions(-)

(limited to 'libs/util/nbproject')

diff --git a/libs/util/nbproject/Makefile-Debug.mk b/libs/util/nbproject/Makefile-Debug.mk
index dfbf4e8..2149f0d 100644
--- a/libs/util/nbproject/Makefile-Debug.mk
+++ b/libs/util/nbproject/Makefile-Debug.mk
@@ -41,6 +41,7 @@ OBJECTFILES= \
 	${OBJECTDIR}/src/AbstractListAssembler.o \
 	${OBJECTDIR}/src/ManagedMap.o \
 	${OBJECTDIR}/src/Codec.o \
+	${OBJECTDIR}/src/Url.o \
 	${OBJECTDIR}/src/ManagedVector.o \
 	${OBJECTDIR}/src/NamedValue.o \
 	${OBJECTDIR}/src/util.o
@@ -50,8 +51,8 @@ OBJECTFILES= \
 CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi
-CXXFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi
+CCFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration
+CXXFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration
 
 # Fortran Compiler Flags
 FFLAGS=
@@ -102,6 +103,11 @@ ${OBJECTDIR}/src/Codec.o: src/Codec.cc
 	${RM} $@.d
 	$(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Codec.o src/Codec.cc
 
+${OBJECTDIR}/src/Url.o: src/Url.cc 
+	${MKDIR} -p ${OBJECTDIR}/src
+	${RM} $@.d
+	$(COMPILE.cc) -g -Wall -D_GNU_SOURCE=1 -D_REENTRANT -Iinclude -I../vdr/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Url.o src/Url.cc
+
 ${OBJECTDIR}/src/ManagedVector.o: src/ManagedVector.cc 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} $@.d
@@ -119,6 +125,7 @@ ${OBJECTDIR}/src/util.o: src/util.cc
 
 # Subprojects
 .build-subprojects:
+	cd ../vdr && ${MAKE}  -f Makefile CONF=Debug
 
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
@@ -127,6 +134,7 @@ ${OBJECTDIR}/src/util.o: src/util.cc
 
 # Subprojects
 .clean-subprojects:
+	cd ../vdr && ${MAKE}  -f Makefile CONF=Debug clean
 
 # Enable dependency checking
 .dep.inc: .depcheck-impl
diff --git a/libs/util/nbproject/Makefile-Release.mk b/libs/util/nbproject/Makefile-Release.mk
index 2fcd899..42ca655 100644
--- a/libs/util/nbproject/Makefile-Release.mk
+++ b/libs/util/nbproject/Makefile-Release.mk
@@ -41,6 +41,7 @@ OBJECTFILES= \
 	${OBJECTDIR}/src/AbstractListAssembler.o \
 	${OBJECTDIR}/src/ManagedMap.o \
 	${OBJECTDIR}/src/Codec.o \
+	${OBJECTDIR}/src/Url.o \
 	${OBJECTDIR}/src/ManagedVector.o \
 	${OBJECTDIR}/src/NamedValue.o \
 	${OBJECTDIR}/src/util.o
@@ -102,6 +103,11 @@ ${OBJECTDIR}/src/Codec.o: src/Codec.cc
 	${RM} $@.d
 	$(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Codec.o src/Codec.cc
 
+${OBJECTDIR}/src/Url.o: src/Url.cc 
+	${MKDIR} -p ${OBJECTDIR}/src
+	${RM} $@.d
+	$(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Url.o src/Url.cc
+
 ${OBJECTDIR}/src/ManagedVector.o: src/ManagedVector.cc 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} $@.d
diff --git a/libs/util/nbproject/configurations.xml b/libs/util/nbproject/configurations.xml
index ac160eb..481eb85 100644
--- a/libs/util/nbproject/configurations.xml
+++ b/libs/util/nbproject/configurations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="80">
+<configurationDescriptor version="84">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <logicalFolder name="HeaderFiles"
                    displayName="Header Files"
@@ -11,7 +11,9 @@
       <itemPath>include/ManagedMap.h</itemPath>
       <itemPath>include/ManagedVector.h</itemPath>
       <itemPath>include/NamedValue.h</itemPath>
+      <itemPath>include/Persistable.h</itemPath>
       <itemPath>include/StringBuilder.h</itemPath>
+      <itemPath>include/Url.h</itemPath>
       <itemPath>include/util.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
@@ -29,6 +31,7 @@
       <itemPath>src/ManagedVector.cc</itemPath>
       <itemPath>src/NamedValue.cc</itemPath>
       <itemPath>src/StringBuilder.cc</itemPath>
+      <itemPath>src/Url.cc</itemPath>
       <itemPath>src/util.cc</itemPath>
     </logicalFolder>
     <logicalFolder name="TestFiles"
@@ -57,7 +60,7 @@
             <pElem>include</pElem>
             <pElem>../vdr/include</pElem>
           </incDir>
-          <commandLine>-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi</commandLine>
+          <commandLine>-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration</commandLine>
           <preprocessorList>
             <Elem>_GNU_SOURCE=1</Elem>
             <Elem>_REENTRANT</Elem>
@@ -66,6 +69,18 @@
         </ccTool>
         <archiverTool>
         </archiverTool>
+        <requiredProjects>
+          <makeArtifact PL="../vdr"
+                        CT="3"
+                        CN="Debug"
+                        AC="true"
+                        BL="true"
+                        WD="../vdr"
+                        BC="${MAKE}  -f Makefile CONF=Debug"
+                        CC="${MAKE}  -f Makefile CONF=Debug clean"
+                        OP="${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libvdr.a">
+          </makeArtifact>
+        </requiredProjects>
       </compileType>
     </conf>
     <conf name="Release" type="3">
diff --git a/libs/util/nbproject/private/configurations.xml b/libs/util/nbproject/private/configurations.xml
index fa15dc7..616cc91 100644
--- a/libs/util/nbproject/private/configurations.xml
+++ b/libs/util/nbproject/private/configurations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="80">
+<configurationDescriptor version="84">
   <projectmakefile>Makefile</projectmakefile>
   <confs>
     <conf name="Debug" type="3">
diff --git a/libs/util/nbproject/project.xml b/libs/util/nbproject/project.xml
index a4df583..afebc06 100644
--- a/libs/util/nbproject/project.xml
+++ b/libs/util/nbproject/project.xml
@@ -8,7 +8,9 @@
             <cpp-extensions>cc</cpp-extensions>
             <header-extensions>h</header-extensions>
             <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
+            <make-dep-projects>
+                <make-dep-project>../vdr</make-dep-project>
+            </make-dep-projects>
             <sourceRootList/>
             <confList>
                 <confElem>
-- 
cgit v1.2.3