X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=glade%2Fautomake.mk;h=0d6363e3c13a9b4104049e370d195fa1d3d163c4;hb=refs%2Fheads%2Fmdd;hp=1f0bf0ba1922303faf17e3b9bc6c28b65c3b82d2;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/glade/automake.mk b/glade/automake.mk
index 1f0bf0ba19..0d6363e3c1 100644
--- a/glade/automake.mk
+++ b/glade/automake.mk
@@ -1,56 +1,70 @@
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 module_LTLIBRARIES = libglade-psppire.la
 
-moduledir = `pkg-config --variable=moduledir gladeui-1.0`
-catalogdir = `pkg-config --variable=catalogdir gladeui-1.0`
-pixmapdir = `pkg-config --variable=pixmapdir gladeui-1.0`
+moduledir = `pkg-config --variable=moduledir gladeui-2.0`
+catalogdir = `pkg-config --variable=catalogdir gladeui-2.0`
+pixmapdir = `pkg-config --variable=pixmapdir gladeui-2.0`
 
-small_pixmapdir = $(pixmapdir)/16x16
-large_pixmapdir = $(pixmapdir)/22x22
+small_pixmapdir = $(pixmapdir)/hicolor/16x16/actions
+large_pixmapdir = $(pixmapdir)/hicolor/22x22/actions
+
+# format.c for psppire-value-entry.c
 
 libglade_psppire_la_SOURCES = \
-	glade/dialog.c \
-	glade/bbox.c \
-	glade/selector.c \
-	glade/acr.c \
-	glade/dictview.c \
-	glade/var-view.c \
+	src/ui/gui/helper.c \
+	src/ui/gui/dialog-common.c \
+	src/ui/gui/psppire-var-ptr.c \
+	src/data/format.c \
+	src/ui/gui/psppire-format.c \
+	src/data/value-labels.c \
 	src/ui/gui/psppire-conf.c \
 	src/ui/gui/psppire-acr.c \
 	src/ui/gui/psppire-buttonbox.c \
-	src/ui/gui/psppire-hbuttonbox.c \
-	src/ui/gui/psppire-vbuttonbox.c \
 	src/ui/gui/psppire-dialog.c \
 	src/ui/gui/psppire-keypad.c \
 	src/ui/gui/psppire-dictview.c \
 	src/ui/gui/psppire-selector.c \
 	src/ui/gui/psppire-select-dest.c \
-	src/ui/gui/psppire-var-view.c
+	src/ui/gui/psppire-var-view.c \
+	src/ui/gui/psppire-checkbox-treeview.c \
+	src/ui/gui/psppire-val-chooser.c \
+	src/ui/gui/psppire-value-entry.c \
+	src/ui/gui/psppire-window-base.c
 
 dist_catalog_DATA = \
 	glade/psppire.xml
 
 dist_small_pixmap_DATA = \
-	glade/icons/16x16/psppire-acr.png \
-	glade/icons/16x16/psppire-hbuttonbox.png \
-	glade/icons/16x16/psppire-vbuttonbox.png \
-	glade/icons/16x16/psppire-dialog.png \
-	glade/icons/16x16/psppire-keypad.png \
-	glade/icons/16x16/psppire-selector.png 
+	glade/icons/16x16/widget-psppire-psppire-acr.png \
+	glade/icons/16x16/widget-psppire-psppire-dialog.png \
+	glade/icons/16x16/widget-psppire-psppire-keypad.png \
+	glade/icons/16x16/widget-psppire-psppire-selector.png
 
 dist_large_pixmap_DATA = \
-	glade/icons/22x22/psppire-acr.png \
-	glade/icons/22x22/psppire-hbuttonbox.png \
-	glade/icons/22x22/psppire-vbuttonbox.png \
-	glade/icons/22x22/psppire-dialog.png \
-	glade/icons/22x22/psppire-keypad.png \
-	glade/icons/22x22/psppire-selector.png 
+	glade/icons/22x22/widget-psppire-psppire-acr.png \
+	glade/icons/22x22/widget-psppire-psppire-dialog.png \
+	glade/icons/22x22/widget-psppire-psppire-keypad.png \
+	glade/icons/22x22/widget-psppire-psppire-selector.png
 
 
 libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
-	-I $(top_srcdir)/src/ui/gui -DDEBUGGING
+	$(GTKSOURCEVIEW_CFLAGS) -I $(top_srcdir)/src/ui/gui -DDEBUGGING
 
 libglade_psppire_la_LIBADD = gl/libgl.la
-
-EXTRA_DIST += glade/OChangeLog