mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2026-02-10 23:20:54 +00:00
Don't link sysprof-text to gtk+.
2005-10-30 Soren Sandmann <sandmann@redhat.com> * configure.ac, Makefile.am: Don't link sysprof-text to gtk+.
This commit is contained in:
Soren Sandmann
committed by
Søren Sandmann Pedersen
Søren Sandmann Pedersen
parent
dff4affaab
commit
60757b6977
@ -1,3 +1,7 @@
|
|||||||
|
2005-10-30 Soren Sandmann <sandmann@redhat.com>
|
||||||
|
|
||||||
|
* configure.ac, Makefile.am: Don't link sysprof-text to gtk+.
|
||||||
|
|
||||||
2005-10-30 Soren Sandmann <sandmann@redhat.com>
|
2005-10-30 Soren Sandmann <sandmann@redhat.com>
|
||||||
|
|
||||||
* Merge stackstash-reorg branch into HEAD
|
* Merge stackstash-reorg branch into HEAD
|
||||||
|
|||||||
37
Makefile.am
37
Makefile.am
@ -20,37 +20,52 @@ SYSPROF_CORE = \
|
|||||||
watch.h \
|
watch.h \
|
||||||
watch.c
|
watch.c
|
||||||
|
|
||||||
|
#
|
||||||
|
# GUI version
|
||||||
|
#
|
||||||
|
|
||||||
sysprof_SOURCES = \
|
sysprof_SOURCES = \
|
||||||
$(SYSPROF_CORE) \
|
$(SYSPROF_CORE) \
|
||||||
treeviewutils.h \
|
treeviewutils.h \
|
||||||
treeviewutils.c \
|
treeviewutils.c \
|
||||||
sysprof.c
|
sysprof.c
|
||||||
|
|
||||||
|
sysprof_CPPFLAGS = \
|
||||||
|
$(GUI_DEP_CFLAGS) \
|
||||||
|
-DDATADIR=\"$(pkgdatadir)\" \
|
||||||
|
-DPIXMAPDIR=\"$(pixmapsdir)\"
|
||||||
|
|
||||||
|
sysprof_LDADD = $(GUI_DEP_LIBS)
|
||||||
|
|
||||||
|
pixmapsdir = $(datadir)/pixmaps
|
||||||
|
|
||||||
|
dist_pkgdata_DATA = sysprof.glade
|
||||||
|
dist_pixmaps_DATA = sysprof-icon.png
|
||||||
|
|
||||||
|
#
|
||||||
|
# Command line version
|
||||||
|
#
|
||||||
|
|
||||||
sysprof_text_SOURCES = \
|
sysprof_text_SOURCES = \
|
||||||
$(SYSPROF_CORE) \
|
$(SYSPROF_CORE) \
|
||||||
signal-handler.h \
|
signal-handler.h \
|
||||||
signal-handler.c \
|
signal-handler.c \
|
||||||
sysprof-text.c
|
sysprof-text.c
|
||||||
|
|
||||||
sysprof_LDADD = $(DEP_LIBS)
|
sysprof_text_CPPFLAGS = \
|
||||||
|
$(CORE_DEP_CFLAGS)
|
||||||
|
|
||||||
sysprof_text_LDADD = $(DEP_LIBS)
|
sysprof_text_LDADD = $(CORE_DEP_LIBS)
|
||||||
|
|
||||||
pixmapsdir = $(datadir)/pixmaps
|
#
|
||||||
|
# Module stuff
|
||||||
INCLUDES = \
|
#
|
||||||
$(DEP_CFLAGS) \
|
|
||||||
-DDATADIR=\"$(pkgdatadir)\" \
|
|
||||||
-DPIXMAPDIR=\"$(pixmapsdir)\"
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
module/sysprof-module.c \
|
module/sysprof-module.c \
|
||||||
module/sysprof-module.h \
|
module/sysprof-module.h \
|
||||||
module/Makefile
|
module/Makefile
|
||||||
|
|
||||||
dist_pkgdata_DATA = sysprof.glade
|
|
||||||
dist_pixmaps_DATA = sysprof-icon.png
|
|
||||||
|
|
||||||
insert-module:
|
insert-module:
|
||||||
modprobe -r sysprof-module
|
modprobe -r sysprof-module
|
||||||
modprobe sysprof-module
|
modprobe sysprof-module
|
||||||
|
|||||||
14
TODO
14
TODO
@ -63,16 +63,6 @@ Before 1.2:
|
|||||||
- Don't export too much of stackstashes to the rest of the
|
- Don't export too much of stackstashes to the rest of the
|
||||||
app
|
app
|
||||||
|
|
||||||
- Reorganise stackstash and profile
|
|
||||||
|
|
||||||
- Remaining TODO before merging into head:
|
|
||||||
|
|
||||||
- rename profiler->collector
|
|
||||||
|
|
||||||
* Consider renaming profiler.[ch] to collector.[ch]
|
|
||||||
|
|
||||||
* Make sure sysprof-text is not linked to gtk+
|
|
||||||
|
|
||||||
* Figure out how to make sfile.[ch] use less memory.
|
* Figure out how to make sfile.[ch] use less memory.
|
||||||
- In general clean sfile.[ch] up a little:
|
- In general clean sfile.[ch] up a little:
|
||||||
- split out dfa in its own generic class
|
- split out dfa in its own generic class
|
||||||
@ -468,6 +458,10 @@ Later:
|
|||||||
|
|
||||||
DONE:
|
DONE:
|
||||||
|
|
||||||
|
* Make sure sysprof-text is not linked to gtk+
|
||||||
|
|
||||||
|
* Consider renaming profiler.[ch] to collector.[ch]
|
||||||
|
|
||||||
* Crash reported by Rudi Chiarito with n_addrs == 0.
|
* Crash reported by Rudi Chiarito with n_addrs == 0.
|
||||||
|
|
||||||
* Find out what distributions it actually works on
|
* Find out what distributions it actually works on
|
||||||
|
|||||||
15
configure.ac
15
configure.ac
@ -79,9 +79,13 @@ fi
|
|||||||
|
|
||||||
# Pkgconfig dependencies
|
# Pkgconfig dependencies
|
||||||
|
|
||||||
dep_modules="gtk+-2.0 > 2.6.0 gthread-2.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
|
core_dep="glib-2.0"
|
||||||
|
gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
|
||||||
|
|
||||||
PKG_CHECK_MODULES(DEP, $dep_modules, [],
|
PKG_CHECK_MODULES(CORE_DEP, $core_dep, [],
|
||||||
|
AC_MSG_ERROR([sysprof dependencies not satisfied]))
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [],
|
||||||
AC_MSG_ERROR([sysprof dependencies not satisfied]))
|
AC_MSG_ERROR([sysprof dependencies not satisfied]))
|
||||||
|
|
||||||
# libiberty and libbfd
|
# libiberty and libbfd
|
||||||
@ -90,14 +94,17 @@ AC_CHECK_LIB(iberty, cplus_demangle,:,
|
|||||||
AC_CHECK_LIB(iberty, cplus_demangle_opname, [],
|
AC_CHECK_LIB(iberty, cplus_demangle_opname, [],
|
||||||
AC_MSG_ERROR([libiberty is required to compile sysprof]), -ldl))
|
AC_MSG_ERROR([libiberty is required to compile sysprof]), -ldl))
|
||||||
|
|
||||||
AC_CHECK_LIB(bfd, bfd_get_error, [DEP_LIBS="$DEP_LIBS -lbfd -liberty"],
|
AC_CHECK_LIB(bfd, bfd_get_error,,
|
||||||
AC_MSG_ERROR([libbfd is required to compile sysprof]),
|
AC_MSG_ERROR([libbfd is required to compile sysprof]),
|
||||||
-liberty)
|
-liberty)
|
||||||
|
|
||||||
|
CORE_DEP_LIBS="$CORE_DEP_LIBS -lbfd -liberty"
|
||||||
|
GUI_DEP_LIBS="$GUI_DEP_LIBS -lbfd -liberty"
|
||||||
|
|
||||||
# emit files
|
# emit files
|
||||||
|
|
||||||
AC_SUBST(DEP_LIBS)
|
AC_SUBST(CORE_DEP_LIBS)
|
||||||
|
AC_SUBST(GUI_DEP_LIBS)
|
||||||
AC_SUBST(MODULE_SUBDIR)
|
AC_SUBST(MODULE_SUBDIR)
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
|
|||||||
Reference in New Issue
Block a user