Commit 7a514fcc authored by janssontoftg's avatar janssontoftg
Browse files

Update of cmake and makefile for order of linking.

parent 0e1f283b

CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ file(GLOB libRendSrcs "lib_rend/*.c") 
file(GLOB libRendHeaders "lib_rend/*.h")



add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

target_link_libraries(lib_rend lib_dec lib_basop lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

target_link_libraries(lib_rend lib_dec lib_com lib_basop lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

target_link_libraries(lib_rend lib_lc3plus lib_isar)

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_isar)
@@ -169,7 +169,7 @@ target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_isar) 
file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_basop lib_com lib_rend lib_debug lib_isar)

target_link_libraries(lib_dec lib_com lib_basop lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)



file(GLOB libUtilSrcs "lib_util/*.c")
@@ -187,7 +187,7 @@ file(GLOB libISARSrcs "lib_isar/*.c") 
file(GLOB libISARHeaders "lib_isar/*.h")



add_library(lib_isar ${libISARSrcs} ${libISARHeaders})

target_link_libraries(lib_isar lib_basop lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.

target_link_libraries(lib_isar lib_com lib_debug lib_lc3plus lib_basop) # Todo refactor: This dependency on lib_dec should be removed.

target_include_directories(lib_isar PUBLIC lib_isar PRIVATE lib_enc lib_dec lib_rend)

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -200,16 +200,16 @@ $(LIB_LIBUTIL): $(OBJS_LIBUTIL) 
	$(QUIET_AR)$(AR) rcs $@ $^



$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -lbasop -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -lbasop -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)



$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -lbasop -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus -lbasop $(LDLIBS) -o $(CLI_APIDEC)



$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS) $(LIB_LIBISAR)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -lisar -livasdec -livasutil -livasdebug -lbasop -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)



$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBISAR) $(LIB_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -lbasop -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -livascom -llc3plus -lbasop $(LDLIBS) -o $(CLI_APIPOSTREND)



libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS) $(LIB_LIBUTIL)