diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-02 19:29:05 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-02 19:29:05 +0000 |
| commit | be6575c39673b06bd51215e47fea86de5f1ee746 (patch) | |
| tree | 33e4facc760cd4a514f044aabf2f49395942e5a8 /src/Makefile.am | |
| parent | Added virtual destructor to SPObject. Switched to new factory. Replaced some ... (diff) | |
| download | inkscape-be6575c39673b06bd51215e47fea86de5f1ee746.tar.gz inkscape-be6575c39673b06bd51215e47fea86de5f1ee746.zip | |
Replaced some forgotten old casting macros.
All object files are first compiled into a static library and then Inkscape and Inkview are linked against this library.
Thus the linker omits some global function calls that are necessary for class registration.
This intermediate step was removed so that both executables are directly linked against all object files.
(bzr r11608.1.71)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b9ec53ab1..aecd79170 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,6 @@ endif noinst_LIBRARIES = \ - libinkscape.a \ dom/libdom.a \ libcroco/libcroco.a \ libavoid/libavoid.a \ @@ -199,13 +198,13 @@ DISTCLEANFILES = \ # ################################################ # this should speed up the build -libinkscape_a_SOURCES = $(ink_common_sources) +#libinkscape_a_SOURCES = $(ink_common_sources) -inkscape_SOURCES += main.cpp $(win32_sources) +inkscape_SOURCES += main.cpp $(ink_common_sources) $(win32_sources) inkscape_LDADD = $(all_libs) inkscape_LDFLAGS = $(kdeldflags) $(mwindows) -inkview_SOURCES += inkview.cpp $(win32_sources) +inkview_SOURCES += inkview.cpp $(ink_common_sources) $(win32_sources) inkview_LDADD = $(all_libs) inkview_LDFLAGS = $(mwindows) |