minor fix to the previous check-in: generation of localization files was wrong
This commit is contained in:
parent
fe4ea304c0
commit
5cdf0151fc
campcaster/src/modules/core/etc
|
@ -61,7 +61,8 @@ USR_BIN_DIR = ${USR_DIR}/bin
|
|||
USR_LIB_DIR = ${USR_DIR}/lib
|
||||
|
||||
GENRB = @GENRB@
|
||||
GENRBOPTS = --destdir ${TMP_DIR}/${PACKAGE_NAME} \
|
||||
TMP_LOCALIZATION_DIR = ${TMP_DIR}/${PACKAGE_NAME}
|
||||
GENRBOPTS = --destdir ${TMP_LOCALIZATION_DIR} \
|
||||
--encoding utf-8 \
|
||||
--strict
|
||||
|
||||
|
@ -173,10 +174,10 @@ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
|
|||
${TMP_DIR}/RdsContainerTest.o \
|
||||
${TMP_DIR}/NumericToolsTest.o
|
||||
|
||||
TEST_RUNNER_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \
|
||||
${TMP_DIR}/${PACKAGE_NAME}_en.res \
|
||||
${TMP_DIR}/${PACKAGE_NAME}_hu.res \
|
||||
${TMP_DIR}/${PACKAGE_NAME}_jp.res
|
||||
TEST_RUNNER_RES = ${TMP_LOCALIZATION_DIR}/root.res \
|
||||
${TMP_LOCALIZATION_DIR}/en.res \
|
||||
${TMP_LOCALIZATION_DIR}/hu.res \
|
||||
${TMP_LOCALIZATION_DIR}/jp.res
|
||||
|
||||
TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} ${BOOST_DATE_TIME_LIB} \
|
||||
-lcppunit -ldl -lxmlrpc++ -ltar
|
||||
|
@ -189,7 +190,7 @@ TEST_RUNNER_LIBS = -l${CORE_LIB} ${ICU_LIBS} ${BOOST_DATE_TIME_LIB} \
|
|||
|
||||
all: dir_setup ${CORE_LIB_FILE}
|
||||
|
||||
dir_setup: ${TMP_DIR} ${DOXYGEN_DIR}
|
||||
dir_setup: ${TMP_DIR} ${TMP_LOCALIZATION_DIR} ${DOXYGEN_DIR}
|
||||
|
||||
doc:
|
||||
${DOXYGEN} ${DOXYGEN_CONFIG}
|
||||
|
@ -198,6 +199,7 @@ clean:
|
|||
${RM} ${CORE_LIB_OBJS} ${CORE_LIB_FILE}
|
||||
${RM} ${TEST_RUNNER_OBJS} ${TEST_RUNNER_RES} ${TEST_RUNNER}
|
||||
${RM} ${TMP_DIR}/*.bb ${TMP_DIR}/*.bbg ${TMP_DIR}/*.da ${TMP_DIR}/*.info
|
||||
${RMDIR} ${TMP_LOCALIZATION_DIR}
|
||||
|
||||
docclean:
|
||||
${RMDIR} ${DOXYGEN_DIR}/html
|
||||
|
@ -228,6 +230,9 @@ ${CORE_LIB_FILE}: ${CORE_LIB_OBJS}
|
|||
${TMP_DIR}:
|
||||
${MKDIR} ${TMP_DIR}
|
||||
|
||||
${TMP_LOCALIZATION_DIR}:
|
||||
${MKDIR} ${TMP_LOCALIZATION_DIR}
|
||||
|
||||
${DOXYGEN_DIR}:
|
||||
${MKDIR} ${DOXYGEN_DIR}
|
||||
|
||||
|
@ -241,6 +246,6 @@ ${TEST_RUNNER}: ${TEST_RUNNER_OBJS} ${CORE_LIB_FILE}
|
|||
${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx
|
||||
${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $<
|
||||
|
||||
${TMP_DIR}/${PACKAGE_NAME}_%.res : ${VAR_DIR}/%.txt
|
||||
${TMP_LOCALIZATION_DIR}/%.res : ${VAR_DIR}/%.txt
|
||||
${GENRB} ${GENRBOPTS} $^
|
||||
|
||||
|
|
Loading…
Reference in New Issue