Browse code

utils: updated Makefile for tools with path to core src

Daniel-Constantin Mierla authored on 08/12/2016 09:06:20
Showing 1 changed files
... ...
@@ -1,23 +1,22 @@
1
-# $Id: Makefile 882 2006-05-30 15:31:09Z miconda $
2 1
 #
3 2
 #  db_berkeley Makefile
4
-# 
3
+#
5 4
 
6
-include ../../Makefile.defs
5
+include ../../src/Makefile.defs
7 6
 
8 7
 auto_gen=
9 8
 NAME=kambdb_recover
10 9
 
11
-include ../../Makefile.sources
10
+include ../../src/Makefile.sources
12 11
 
13 12
 # if you want to tune or reset flags
14 13
 #DEFS:=-DEXTRA_DEBUG  -I$(LOCALBASE)/BerkeleyDB.4.6/include
15 14
 DEFS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
16 15
         -I$(LOCALBASE)/include/db4 -I$(SYSBASE)/include
17
-        
16
+
18 17
 LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19 18
 
20
-include ../../Makefile.rules
19
+include ../../src/Makefile.rules
21 20
 
22 21
 modules:
23 22
 
Browse code

- fix compilation on OpenBSD, related to missing includes paths and wrong order of headers, patches from Jason Creighton, jcreigh at gmail dot com - seas: move stdio.h include before <netinet/in.h>, closes #2183510 - ldap: also include localbase to Makefile, closes #2183544 - h350: also include localbase to Makefile, closes #2183551 - db_berkeley: add OpenBSD include directory to Makefile, closes #2183577

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5099 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 21/10/2008 09:23:07
Showing 1 changed files
... ...
@@ -13,7 +13,7 @@ include ../../Makefile.sources
13 13
 # if you want to tune or reset flags
14 14
 #DEFS:=-DEXTRA_DEBUG  -I$(LOCALBASE)/BerkeleyDB.4.6/include
15 15
 DEFS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
16
-        -I$(SYSBASE)/include
16
+        -I$(LOCALBASE)/include/db4 -I$(SYSBASE)/include
17 17
         
18 18
 LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19 19
 
Browse code

- renamed: bdb_recover -> kambdb_recover

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4602 689a6050-402a-0410-94f2-e92a70836424

Klaus Darilion authored on 06/08/2008 11:44:43
Showing 1 changed files
... ...
@@ -6,7 +6,7 @@
6 6
 include ../../Makefile.defs
7 7
 
8 8
 auto_gen=
9
-NAME=bdb_recover
9
+NAME=kambdb_recover
10 10
 
11 11
 include ../../Makefile.sources
12 12
 
Browse code

- fix LIBS, don't link with unnecessary libraries, related to #1855859

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4472 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 10/07/2008 09:03:48
Showing 1 changed files
... ...
@@ -12,10 +12,10 @@ include ../../Makefile.sources
12 12
 
13 13
 # if you want to tune or reset flags
14 14
 #DEFS:=-DEXTRA_DEBUG  -I$(LOCALBASE)/BerkeleyDB.4.6/include
15
-DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
15
+DEFS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
16 16
         -I$(SYSBASE)/include
17 17
         
18
-LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
18
+LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19 19
 
20 20
 include ../../Makefile.rules
21 21
 
Browse code

- don't try to install the openserctl.db_berkeley, this is not available for now - only compile the db_berkeley utils if there are included in the Makefile

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2864 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 05/10/2007 11:07:43
Showing 1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 # $Id: Makefile 882 2006-05-30 15:31:09Z miconda $
2 2
 #
3
-#  serunix Makefile
3
+#  db_berkeley Makefile
4 4
 # 
5 5
 
6 6
 include ../../Makefile.defs
... ...
@@ -17,6 +17,7 @@ DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
17 17
         
18 18
 LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19 19
 
20
-all:
20
+include ../../Makefile.rules
21
+
22
+modules:
21 23
 
22
-#include ../../Makefile.rules
Browse code

- disabled the utility compiling as it requires external libs. Need to find a way to compile it or not....

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2850 689a6050-402a-0410-94f2-e92a70836424

Bogdan-Andrei Iancu authored on 04/10/2007 11:48:19
Showing 1 changed files
... ...
@@ -16,5 +16,7 @@ DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
16 16
         -I$(SYSBASE)/include
17 17
         
18 18
 LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19
-        
20
-include ../../Makefile.rules
19
+
20
+all:
21
+
22
+#include ../../Makefile.rules
Browse code

- import berkeley database module into trunk - Many thanks to William Quan from Cisco Systems for the contribution - based on patch #1803180, renamed from berkely_db to db_berkeley - Some work still remains: - build berkley_db as own debian package - add berkley_db to the xml database creation process to generate the content in scripts/db_berkley/openser like the dbtext stuff - evaluate if its possible to use the db_free_row and db_free_rows functions for this module - port to new logging system

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2844 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 04/10/2007 11:15:01
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,20 @@
1
+# $Id: Makefile 882 2006-05-30 15:31:09Z miconda $
2
+#
3
+#  serunix Makefile
4
+# 
5
+
6
+include ../../Makefile.defs
7
+
8
+auto_gen=
9
+NAME=bdb_recover
10
+
11
+include ../../Makefile.sources
12
+
13
+# if you want to tune or reset flags
14
+#DEFS:=-DEXTRA_DEBUG  -I$(LOCALBASE)/BerkeleyDB.4.6/include
15
+DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
16
+        -I$(SYSBASE)/include
17
+        
18
+LIBS+=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
19
+        
20
+include ../../Makefile.rules