Optimize make build.

acl-dev · Apr 16, 2024 · dcce3ea · dcce3ea
1 parent 37dada8
commit dcce3ea
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/lib_acl/samples/Makefile.in b/lib_acl/samples/Makefile.in
@@ -137,7 +137,7 @@ ACL_LIB    = $(ACL_PATH)/lib
 
 EXTLIBS =
 CFLAGS += -I$(ACL_INC)
-LDFLAGS = -L$(ACL_LIB) -lacl $(EXTLIBS) $(SYSLIB)
+LDFLAGS = -L$(ACL_LIB) -Wl,-rpath,$(ACL_LIB) -lacl $(EXTLIBS) $(SYSLIB)
 
 ###########################################################
 

diff --git a/lib_acl/samples/Makefile_cpp.in b/lib_acl/samples/Makefile_cpp.in
@@ -137,7 +137,7 @@ EXTLIBS =
 #CFLAGS += -I$(ACL_INC) -I$(PROTO_INC)
 #LDFLAGS = -L$(ACL_LIB) -L$(PROTO_LIB) -l_protocol -lacl $(EXTLIBS) $(SYSLIB)
 CFLAGS += -I$(ACL_INC)
-LDFLAGS = -L$(ACL_LIB) -lacl $(EXTLIBS) $(SYSLIB)
+LDFLAGS = -L$(ACL_LIB) -Wl,-rpath,$(ACL_LIB) -lacl $(EXTLIBS) $(SYSLIB)
 
 
 ###########################################################

diff --git a/lib_acl_cpp/samples/Makefile.in b/lib_acl_cpp/samples/Makefile.in
@@ -153,8 +153,10 @@ endif
 #endif
 
 CFLAGS += -I. -I$(BASE_PATH)/include -I$(BASE_PATH)/../lib_acl/include -I$(BASE_PATH)/../lib_protocol/include
-LDFLAGS = -L$(BASE_PATH)/lib -lacl_cpp -L$(BASE_PATH)/../lib_protocol/lib -lprotocol -L$(BASE_PATH)/../lib_acl/lib -lacl \
-	  -L$(BASE_PATH)/../lib/$(RPATH) $(EXTLIBS) $(SYSLIB)
+LDFLAGS = -L$(BASE_PATH)/lib -lacl_cpp -Wl,-rpath,$(BASE_PATH)/lib \
+	-L$(BASE_PATH)/../lib_protocol/lib -lprotocol -Wl,-rpath,$(BASE_PATH)/../lib_protocol/lib \
+	-L$(BASE_PATH)/../lib_acl/lib -lacl -Wl,-rpath,$(BASE_PATH)/../lib_acl/lib \
+	-L$(BASE_PATH)/../lib/$(RPATH) $(EXTLIBS) $(SYSLIB)
 
 COMPILE = $(CC) $(CFLAGS)
 LINK = $(CC) $(OBJ) $(LDFLAGS)

diff --git a/lib_fiber/samples/Makefile.in b/lib_fiber/samples/Makefile.in
@@ -156,7 +156,10 @@ FIBER_LIB  = $(FIBER_PATH)/lib
 
 EXTLIBS =
 CFLAGS += -I.. -I$(PRO_INC) -I$(ACL_INC) -I$(FIBER_INC)
-LDFLAGS = -L$(PRO_LIB) -lprotocol -L$(ACL_LIB) -lacl -L$(FIBER_LIB) -lfiber $(EXTLIBS) $(SYSLIB)
+LDFLAGS = -L$(PRO_LIB) -lprotocol -Wl,-rpath,$(PRO_LIB) \
+	-L$(ACL_LIB) -lacl -Wl,-rpath,$(ACL_LIB) \
+	-L$(FIBER_LIB) -lfiber -Wl,-rpath,$(FIBER_LIB) \
+	$(EXTLIBS) $(SYSLIB)
 
 ###########################################################
 

diff --git a/lib_fiber/samples/Makefile_cpp.in b/lib_fiber/samples/Makefile_cpp.in
@@ -136,10 +136,10 @@ endif
 CFLAGS += -I.. -I../../../lib_acl/include -I../../../lib_protocol/include -I../../../lib_acl_cpp/include \
 	  -I../../../lib_fiber/c/include -I../../../lib_fiber/cpp/include
 EXTLIBS =
-LDFLAGS = -L../../../lib_fiber/lib -lfiber_cpp \
-	  -L../../../lib_acl_cpp/lib -lacl_cpp \
-	  -L../../../lib_protocol/lib -lprotocol \
-	  -L../../../lib_acl/lib -lacl \
+LDFLAGS = -L../../../lib_fiber/lib -lfiber_cpp -Wl,-rpath,../../../lib_fiber/lib \
+	  -L../../../lib_acl_cpp/lib -lacl_cpp -Wl,-rpath,../../../lib_acl_cpp/lib \
+	  -L../../../lib_protocol/lib -lprotocol -Wl,-rpath,../../../lib_protocol/lib \
+	  -L../../../lib_acl/lib -lacl -Wl,-rpath,../../../lib_acl/lib \
 	  -lfiber $(EXTLIBS) $(SYSLIB)
 
 COMPILE = $(CC) $(CFLAGS)

diff --git a/lib_protocol/samples/Makefile.in b/lib_protocol/samples/Makefile.in
@@ -114,7 +114,8 @@ PROTO_LIB  = $(PROTO_PATH)/lib
 
 EXTLIBS =
 CFLAGS += -I$(ACL_INC) -I$(PROTO_INC)
-LDFLAGS = -L$(ACL_LIB) -L$(PROTO_LIB) -lprotocol -lacl $(EXTLIBS) $(SYSLIB)
+LDFLAGS = -L$(PROTO_LIB) -lprotocol -Wl,-rpath,$(PROTO_LIB) \
+	-L$(ACL_LIB) -lacl -Wl,-rpath,$(ACL_LIB) $(EXTLIBS) $(SYSLIB)
 
 ###########################################################