Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zmap
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
zmap
Commits
b056ad25
Commit
b056ad25
authored
15 years ago
by
edgrif
Browse files
Options
Downloads
Patches
Plain Diff
disable libtool from trying to build shared libs for zmap stuff.
parent
4d3bdffa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile.am
+9
-6
9 additions, 6 deletions
src/Makefile.am
src/configure.ac
+3
-0
3 additions, 0 deletions
src/configure.ac
with
12 additions
and
6 deletions
src/Makefile.am
+
9
−
6
View file @
b056ad25
...
...
@@ -47,20 +47,23 @@ pkgconfig_DATA = zmap.pc
################################################################################
################################################################################
# I've commented out all the -all-static stuff because I think I've done it a
# better way by disabling libtool building of shared libs in configure.ac
# Libraries (These are libtool convenience libraries)
noinst_LTLIBRARIES
=
libZMapApp.la libZMap.la libZMapThr.la libZMapXML.la libPFetch.la
libZMapXML_la_SOURCES
=
libZMapXML_la_LIBADD
=
zmapXML/libZMapXML.la
libZMapXML_la_LDFLAGS
=
-all-static
#
libZMapXML_la_LDFLAGS = -all-static
libPFetch_la_SOURCES
=
libPFetch_la_LIBADD
=
libpfetch/libpfetch.la libcurlobject/libcurlobject.la
libPFetch_la_LDFLAGS
=
-all-static
#
libPFetch_la_LDFLAGS = -all-static
libZMap_la_SOURCES
=
libZMap_la_LDFLAGS
=
-all-static
#
libZMap_la_LDFLAGS = -all-static
libZMap_la_LIBADD
=
\
zmapControl/libZMapControl.la
\
zmapConfig/libZMapConfig.la
\
...
...
@@ -76,10 +79,10 @@ $(NULL)
libZMapApp_la_SOURCES
=
libZMapApp_la_LIBADD
=
zmapApp/libZMapApp.la
libZMapApp_la_LDFLAGS
=
-all-static
#
libZMapApp_la_LDFLAGS = -all-static
libZMapThr_la_SOURCES
=
libZMapThr_la_LDFLAGS
=
-all-static
#
libZMapThr_la_LDFLAGS = -all-static
libZMapThr_la_LIBADD
=
\
zmapServer/libZMapServer.la
\
zmapServer/libZMapServers.la
\
...
...
@@ -139,7 +142,7 @@ check_LTLIBRARIES = libcheckZMap.la
libcheckZMap_la_DEPENDENCIES
=
$(
noinst_LTLIBRARIES
)
$(
libcheckZMap_la_LIBADD
)
libcheckZMap_la_SOURCES
=
libcheckZMap_la_LDFLAGS
=
-all-static
#
libcheckZMap_la_LDFLAGS = -all-static
libcheckZMap_la_LIBADD
=
\
libpfetch/tests/libcheckPFetch.la
\
zmapFeature/tests/libcheckZMapFeature.la
\
...
...
This diff is collapsed.
Click to expand it.
src/configure.ac
+
3
−
0
View file @
b056ad25
...
...
@@ -116,6 +116,9 @@ AC_SUBST(ZMAP_DOXY_HTML_HEADER)
AC_SUBST(ZMAP_DOXY_HTML_FOOTER)
dnl Disable shared libs so foocanvas is bound in to zmap.
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
AM_INIT_AUTOMAKE
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment