s3: piddir creation fix part 2.

[ira/wip.git] / examples / perfcounter / Makefile

diff --git a/examples/perfcounter/Makefile b/examples/perfcounter/Makefile
index 07bc7657c9ce8143a27ba73ad86e61320bcf5c79..86e21909f11015c2cbd37f5292b42c70b30b452e 100644 (file)
--- a/examples/perfcounter/Makefile
+++ b/examples/perfcounter/Makefile
@@ -3,7 +3,7 @@
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,


@@ -12,26 +12,26 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.

 # 
 
 # 
 

-SAMBA_SRC_DIR=../../source
-TDB_SRC_DIR=$(SAMBA_SRC_DIR)/tdb
+SAMBA_SRC_DIR=../../source3
+TDB_SRC_DIR=$(SAMBA_SRC_DIR)/../lib/tdb

 
 

-CFLAGS = -g -I$(SAMBA_SRC_DIR)/include -I$(TDB_SRC_DIR)
+CFLAGS = -g -I$(SAMBA_SRC_DIR) -I$(SAMBA_SRC_DIR)/include -I$(TDB_SRC_DIR)/include -I../../

 CC = gcc
 
 PROGS = perfcount
 CC = gcc
 
 PROGS = perfcount

-TDB_OBJ = $(TDB_SRC_DIR)/tdb.o $(TDB_SRC_DIR)/spinlock.o $(TDB_SRC_DIR)/tdbback.o
+TDB_OBJ = $(TDB_SRC_DIR)/common/tdb.o $(TDB_SRC_DIR)/common/dump.o \
+       $(TDB_SRC_DIR)/common/error.o $(TDB_SRC_DIR)/common/freelist.o \
+       $(TDB_SRC_DIR)/common/io.o $(TDB_SRC_DIR)/common/lock.o \
+       $(TDB_SRC_DIR)/common/open.o $(TDB_SRC_DIR)/common/transaction.o \
+       $(TDB_SRC_DIR)/common/traverse.o $(TDB_SRC_DIR)/common/hash.o

 PERF_WRITER_OBJ = perf_writer.o perf_writer_mem.o perf_writer_util.o perf_writer_cpu.o perf_writer_process.o perf_writer_disk.o
 
 default: $(PROGS)
 
 PERF_WRITER_OBJ = perf_writer.o perf_writer_mem.o perf_writer_util.o perf_writer_cpu.o perf_writer_process.o perf_writer_disk.o
 
 default: $(PROGS)
 

-$(TDB_OBJ):
-       cd $(TDB_SRC_DIR) && make
-
-perfcount: $(PERF_WRITER_OBJ) $(TDB_OBJ)
+perfcount: $(PERF_WRITER_OBJ)

        $(CC) $(CFLAGS) -o perfcount $(PERF_WRITER_OBJ) $(TDB_OBJ)
 
 clean:
        $(CC) $(CFLAGS) -o perfcount $(PERF_WRITER_OBJ) $(TDB_OBJ)
 
 clean: