include $(top_srcdir)/config/common.am
-CLEANFILES += $(BUILT_SOURCES)
-
-EXTRA_DIST = pch.h \
- os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
noinst_LIBRARIES = liblyxsupport.a
-BUILT_SOURCES = $(PCH_FILE)
######################### Qt stuff #############################
#
-MOCHEADER = SystemcallPrivate.h
+MOCHEADER = \
+ ConsoleApplicationPrivate.h \
+ FileMonitor.h \
+ SystemcallPrivate.h
MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
-CLEANFILES += $(MOCEDFILES)
-BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
moc_%.cpp: %.h
- $(QT_MOC) -o $@ $<
+ $(AM_V_GEN)$(QT_MOC) -o $@ $<
liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
#
##################################################################
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+ $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) \
+ $(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
liblyxsupport_a_SOURCES = \
FileMonitor.h \
FileMonitor.cpp \
RandomAccessList.h \
+ any.h \
bind.h \
+ Cache.h \
+ Changer.h \
+ checksum.cpp \
+ checksum.h \
+ ConsoleApplication.cpp \
+ ConsoleApplication.h \
+ ConsoleApplicationPrivate.h \
convert.cpp \
convert.h \
copied_ptr.h \
+ counter_reps.cpp \
+ counter_reps.h \
debug.cpp \
debug.h \
docstream.cpp \
FileNameList.h \
filetools.cpp \
filetools.h \
- foreach.h \
ForkedCalls.cpp \
ForkedCalls.h \
functional.h \
kill.cpp \
lassert.h \
lassert.cpp \
+ Length.cpp \
+ Length.h \
+ lengthcommon.cpp \
limited_stack.h \
lstrings.cpp \
lstrings.h \
lyxalgo.h \
lyxlib.h \
+ lyxmagic.h \
lyxtime.cpp \
lyxtime.h \
mutex.h \
pmprof.h \
qstring_helpers.cpp \
qstring_helpers.h \
- regex.h \
+ signals.h \
socktools.cpp \
socktools.h \
strfwd.h \
Systemcall.cpp \
Systemcall.h \
SystemcallPrivate.h \
- shared_ptr.h \
TempFile.cpp \
TempFile.h \
textutils.h \
trivstring.cpp \
trivstring.h \
types.h \
+ unique_ptr.h \
userinfo.cpp \
userinfo.h \
unicode.cpp \
unicode.h \
weighted_btree.h
-if USE_INCLUDED_MYTHES
-liblyxsupport_a_SOURCES += \
- mythes/mythes.cxx \
- mythes/mythes.hxx \
- mythes/license.readme
-endif
-
-#if INSTALL_MACOSX
-#liblyxsupport_a_SOURCES += \
-# AppleSpellChecker.h \
-# AppleSpellChecker.mm
-#endif
if INSTALL_MACOSX
liblyxsupport_a_SOURCES += \
AppleScript.h \
AppleScript.m \
AppleScriptProxy.cpp \
+ AppleSupport.h \
+ AppleSupport.m \
linkback/LinkBack.h \
linkback/LinkBack.m \
linkback/LinkBackProxy.h \
check_trivstring
if INSTALL_MACOSX
-ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
+ADD_FRAMEWORKS = \
+ -framework QtCore -framework AppKit -framework ApplicationServices \
+ -Wl,-rpath,@loader_path/../Frameworks \
+ -Wl,-rpath,@executable_path/../Frameworks \
+ -Wl,-headerpad_max_install_names
endif
-check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
-check_convert_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_convert_SOURCES = \
tests/check_convert.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_filetools_SOURCES = \
tests/check_filetools.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_lstrings_SOURCES = \
tests/check_lstrings.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_trivstring_SOURCES = \
tests/check_trivstring.cpp \