Commit bd500055 authored by unknown's avatar unknown
Browse files

fixed makefiles in examples to adopt to change in file structure

parent f473a0d8

storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -6,18 +6,18 @@ CFLAGS = -c -Wall -fno-rtti -fno-exceptions 
CXXFLAGS = 

DEBUG = 

LFLAGS = -Wall

TOP_SRCDIR = ../../..

INCLUDE_DIR = $(TOP_SRCDIR)

LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \

TOP_SRCDIR = ../../../..

INCLUDE_DIR = $(TOP_SRCDIR)/storage/ndb/include

LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \

          -L$(TOP_SRCDIR)/libmysql_r/.libs \

          -L$(TOP_SRCDIR)/mysys

          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings

SYS_LIB = 



$(TARGET): $(OBJS)

	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)

	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)



$(TARGET).o: $(SRCS)

	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/mgmapi  -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)

	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)



clean:

	rm -f *.o $(TARGET)

storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ CFLAGS = -g -c -Wall -fno-rtti -fno-exceptions 
CXXFLAGS = -g

DEBUG = 

LFLAGS = -Wall

TOP_SRCDIR = ../../..

TOP_SRCDIR = ../../../..

INCLUDE_DIR = $(TOP_SRCDIR)

LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \

LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \

          -L$(TOP_SRCDIR)/libmysql_r/.libs \

          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings

SYS_LIB =
@@ -17,7 +17,7 @@ $(TARGET): $(OBJS) 
	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)



$(TARGET).o: $(SRCS)

	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/ndb/include -I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)

	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)



clean:

	rm -f *.o $(TARGET)

storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -5,17 +5,18 @@ CXX = g++ 
CFLAGS = -c -Wall -fno-rtti -fno-exceptions

DEBUG = 

LFLAGS = -Wall

INCLUDE_DIR = ../../include

LIB_DIR = -L../../src/.libs \

          -L../../../libmysql_r/.libs \

          -L../../../mysys -L../../../strings

TOP_SRCDIR = ../../../..

INCLUDE_DIR = $(TOP_SRCDIR)

LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \

          -L$(TOP_SRCDIR)/libmysql_r/.libs \

          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings

SYS_LIB = 



$(TARGET): $(OBJS)

	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)



$(TARGET).o: $(SRCS)

	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)



clean:

	rm -f *.o $(TARGET)

storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ CFLAGS = -c -Wall -fno-rtti -fno-exceptions 
CXXFLAGS = 

DEBUG = 

LFLAGS = -Wall

TOP_SRCDIR = ../../..

INCLUDE_DIR = $(TOP_SRCDIR)/ndb/include

LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \

TOP_SRCDIR = ../../../..

INCLUDE_DIR = $(TOP_SRCDIR)/storage/ndb/include

LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \

          -L$(TOP_SRCDIR)/libmysql_r/.libs \

          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings

SYS_LIB =

storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ CXX = g++ 
CFLAGS = -c -Wall -fno-rtti -fno-exceptions

DEBUG = 

LFLAGS = -Wall

TOP_SRCDIR = ../../../..

INCLUDE_DIR = ../../include

LIB_DIR = -L../../src/.libs \

          -L../../../libmysql_r/.libs \

          -L../../../mysys -L../../../strings

LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/src/.libs \

          -L$(TOP_SRCDIR)/libmysql_r/.libs \

          -L$(TOP_SRCDIR)/mysys -L$(TOP_SRCDIR)/strings

SYS_LIB = 



$(TARGET): $(OBJS)