projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index c6aa455d4112d6140b65e4e5ddd7bf7fc1a196ee..9ac7050c133637d21a305390aa1f1194c874bd54 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-3,7
+3,7
@@
bin_PROGRAMS += src/ui/gui/psppire
src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
bin_PROGRAMS += src/ui/gui/psppire
src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
- -DINSTALLDIR=\"$(bindir)\"
+ -DINSTALLDIR=\"$(bindir)\"
-DGDK_MULTIHEAD_SAFE=1
src_ui_gui_psppire_LDFLAGS = \
src_ui_gui_psppire_LDFLAGS = \
@@
-53,20
+53,12
@@
src_ui_gui_psppire_LDADD = \
-dlopen src/ui/gui/libpsppire.la \
src/ui/gui/libpsppwidgets.la \
lib/gtksheet/libgtksheet.a \
-dlopen src/ui/gui/libpsppire.la \
src/ui/gui/libpsppwidgets.la \
lib/gtksheet/libgtksheet.a \
- src/language/liblanguage.a \
- src/ui/libuicommon.a \
- src/output/charts/libcharts.a \
- src/output/liboutput.a \
- src/math/libpspp_math.a \
- lib/linreg/liblinreg.a \
- lib/misc/libmisc.a \
- src/data/libdata.a \
- src/libpspp/libpspp.a \
+ src/ui/libuicommon.la \
+ src/libpspp.la \
+ src/libpspp-core.la \
$(GTK_LIBS) \
$(GLADE_LIBS) \
$(GTK_LIBS) \
$(GLADE_LIBS) \
- $(PG_LIBS) \
- gl/libgl.la \
- @LIBINTL@ @LIBREADLINE@
+ @LIBINTL@
src_ui_gui_psppiredir = $(pkgdatadir)
src_ui_gui_psppiredir = $(pkgdatadir)