X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=6eba71890368ef2838d4b05990968bcd9965c8ac;hb=a55b554c0479168ef3e4879fe0fa517f7ca4def7;hp=511bfa224790cb3e7be136f9ad5afee0eeb1804c;hpb=53ceff2865473a6b561b521986fafd31a993a1a6;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 511bfa22..6eba7189 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,15 +2,6 @@
 
 bin_PROGRAMS += src/ui/gui/psppire
 
-src/ui/gui/%: AM_CPPFLAGS = \
-	-export-dynamic \
-	-I$(top_srcdir)/gl \
-	-I$(top_srcdir)/lib/gtksheet \
-	-I$(top_srcdir)/src/ui/gui \
-	-I$(top_srcdir)/src/data \
-	-I$(top_srcdir)/src/libpspp
-
-
 src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -19,11 +10,18 @@ src_ui_gui_psppire_LDFLAGS = \
 src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GLADE_LIBS) \
-	-lgtksheet -L$(top_builddir)/lib/gtksheet \
-	-ldata -L$(top_builddir)/src/data \
-	-lpspp -L$(top_builddir)/src/libpspp \
-	 -lgl -L$(top_builddir)/gl    \
-	 @LIBINTL@ @LIBREADLINE@
+	$(top_builddir)/lib/gtksheet/libgtksheet.a \
+	$(top_builddir)/src/data/libdata.a \
+	$(top_builddir)/src/libpspp/libpspp.a \
+	$(top_builddir)/gl/libgl.a \
+	@LIBINTL@ @LIBREADLINE@
+
+src_ui_gui_psppiredir = $(pkgdatadir)
+
+dist_src_ui_gui_psppire_DATA = \
+	$(top_srcdir)/src/ui/gui/psppire.glade \
+	$(top_srcdir)/src/ui/gui/psppicon.png \
+	$(top_srcdir)/src/ui/gui/pspplogo.png
 
 
 src_ui_gui_psppire_SOURCES = \
@@ -57,7 +55,4 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/var-sheet.c \
 	src/ui/gui/var-sheet.h \
 	src/ui/gui/var-type-dialog.c \
-	src/ui/gui/var-type-dialog.h 
-
-
-
+	src/ui/gui/var-type-dialog.h