diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-19 20:20:23 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-19 20:20:23 +0000 |
| commit | b7851ae5e335ca4ec5554da09cd3c131913cd7d1 (patch) | |
| tree | ab721bd21f47a97ae70671539ebfe83dff272397 | |
| parent | 6d21a23228a4b383181a9de5806643365fa0df7c (diff) | |
| download | tdeedu-b7851ae5e335ca4ec5554da09cd3c131913cd7d1.tar.gz tdeedu-b7851ae5e335ca4ec5554da09cd3c131913cd7d1.zip | |
Fix a couple kdeedu build problems on armel
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1259743 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kalzium/configure.in.in | 5 | ||||
| -rw-r--r-- | kalzium/src/Makefile.am | 2 | ||||
| -rw-r--r-- | libkdeedu/extdate/extdatetimeedit.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/kalzium/configure.in.in b/kalzium/configure.in.in index 24a74adc..9d44e5dd 100644 --- a/kalzium/configure.in.in +++ b/kalzium/configure.in.in @@ -45,11 +45,14 @@ if test "x$with_ocamlsolver" != xno; then EQCHEM_SUB= OCAMLLIB= + OCAMLLIB_FLAGS= EQCHEM_LDADD= if test "$eqchem_enabled" = "yes"; then EQCHEM_SUB=solver OCAMLLIB=`ocamlc -where` + OCAMLLIB_FLAGS=-L$(OCAMLLIB) FACILELIB=`ocamlc -where`/facile + FACILELIB_FLAGS=-L$(FACILELIB) EQCHEM_LDADD="-lasmrun -lnums -lm -ldl solver.o modwrap.o" AC_DEFINE(HAVE_FACILE, 1) @@ -58,6 +61,8 @@ if test "x$with_ocamlsolver" != xno; then AC_SUBST(EQCHEM_SUB) AC_SUBST(OCAMLLIB) AC_SUBST(FACILELIB) + AC_SUBST(OCAMLLIB_FLAGS) + AC_SUBST(FACILELIB_FLAGS) AC_SUBST(EQCHEM_LDADD) if test "$eqchem_enabled" = "yes"; then diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am index 22c28ff0..ba759011 100644 --- a/kalzium/src/Makefile.am +++ b/kalzium/src/Makefile.am @@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \ moleculeparser.cpp \ tempunit.cpp -kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD) +kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD) KDE_CXXFLAGS = -D_ISOC99_SOURCE SUBDIRS = icons elementpics data $(EQCHEM_SUB) diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h index 1e82fe92..4a2aaa16 100644 --- a/libkdeedu/extdate/extdatetimeedit.h +++ b/libkdeedu/extdate/extdatetimeedit.h @@ -25,10 +25,9 @@ #ifndef EXTDATETIMEEDIT_H #define EXTDATETIMEEDIT_H -#ifndef TQT_H #include <tqwidget.h> #include <tqstring.h> -#endif // TQT_H +#include <tqrangecontrol.h> #include "extdatetime.h" |