Changeset 335 in PSPA

Timestamp:

Feb 20, 2013, 2:30:15 PM (11 years ago)

Author:

garnier

Message:

Remise mise en place d'une seule librarie

File:

• Interface_Web/trunk/pspaWT/cmt/requirements (modified) (3 diffs)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -12 +12 @@
 include_dirs $(PSPAWTROOT)/sources/userInterface/include  $(PSPAWTROOT)/sources/controler/include
 
-library PSPA_controlerLib   \
+
+library PSPA_Lib   \
  ../sources/controler/src/bareParticle.cc \
  ../sources/controler/src/particleBeam.cc \
@@ -32 +33 @@
  ../sources/controler/src/softwareTransport.cc \
  ../sources/controler/src/softwareGenerator.cc \
- ../sources/controler/src/softwareTest.cc 
-
-
-macro lib_PSPA_controlerLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DPSPA_DEBUG"
-
-macro PSPA_controlerLib_shlibflags   "   ${PSPA_userInterfaceLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
-
-macro PSPA_controlerLib_dependencies   " ${PSPA_userInterfaceLib} "
-
-macro PSPA_controlerLib_linkopts     " -L${PSPAWTROOT}/${Platform_bin} -lPSPA_controlerLib "
-
-
-library PSPA_userInterfaceLib   \
+ ../sources/controler/src/softwareTest.cc \
  ../sources/userInterface/src/GWt_cell.cc \
  ../sources/userInterface/src/GWt_rfgun.cc \
@@ -66 +55 @@
 
 
-macro lib_PSPA_userInterfaceLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DPSPA_DEBUG"
+macro lib_PSPA_Lib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DPSPA_DEBUG"
 
-macro PSPA_userInterfaceLib_shlibflags   " ${PSPA_controlerLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
+macro PSPA_Lib_shlibflags   " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
 
-macro PSPA_userInterfaceLib_dependencies   " ${PSPA_controlerLib} "
-
-macro PSPA_userInterfaceLib_linkopts     " -L${PSPAWTROOT}/${Platform_bin} -lPSPA_userInterfaceLib "
+macro PSPA_Lib_linkopts     " -L${PSPAWTROOT}/${Platform_bin} -lPSPA_userInterfaceLib "
 
 
 
 
-macro_append pspaWT_cppflags "${lib_PSPA_controlerLib_cppflags} ${lib_PSPA_userInterfaceLib_cppflags}"
-macro_append pspaWTlinkopts "${PSPA_controlerLib_linkopts} ${PSPA_userInterfaceLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
+macro_append pspaWT_cppflags "${lib_PSPA_Lib_cppflags}"
+macro_append pspaWTlinkopts "${PSPA_Lib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
 
-macro pspaWT_linkopts " ${PSPA_controlerLib_linkopts} ${PSPA_userInterfaceLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
+macro pspaWT_linkopts " ${PSPA_Lib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
 
 application pspaWT ../sources/controler/src/main.cc
-macro_append pspaWT_dependencies " PSPA_controlerLib PSPA_userInterfaceLib"
+macro_append pspaWT_dependencies " PSPA_Lib "