Changes in src/UIElements/Makefile.am [e0b5f0:3b35e7]

File:

• src/UIElements/Makefile.am (modified) (3 diffs)

src/UIElements/Makefile.am

@@ -226 +226 @@
 lib_LTLIBRARIES += libMolecuilderUI.la
 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 
+libMolecuilderUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 
 if CONDJOBMARKET
 libMolecuilderUI_la_CPPFLAGS += ${JobMarket_CFLAGS}
@@ -254 +254 @@
         libMolecuilderGraph.la \
         libMolecuilderFilling.la \
-        libMolecuilder.la
+        libMolecuilder.la \
+        libMolecuilderFragmentationAutomation.la \
+        libMolecuilderFragmentation_getFromKeyset.la \
+        libMolecuilderFragmentation.la \
+        libMolecuilderJobs.la
 if CONDJOBMARKET
 libMolecuilderUI_la_LIBADD += \
-        libMolecuilderFragmentationAutomation.la
-endif
-libMolecuilderUI_la_LIBADD += \
-        libMolecuilderFragmentation_getFromKeyset.la \
-        libMolecuilderFragmentation.la
-if CONDJOBMARKET
-libMolecuilderUI_la_LIBADD += \
-        libMolecuilderJobs.la \
         ${JobMarket_Controller_LIBS}
 endif
@@ -348 +344 @@
 
 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
+libMolecuilderQtUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
 libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)