summary refs log tree commit diff stats
path: root/src/fe-gtk/Makefile.am
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2014-02-05 20:42:48 -0500
committerTingPing <tingping@tingping.se>2014-02-06 20:17:08 -0500
commit34cf164aa28c45c15ecf39b855f2de833a9b7c2d (patch)
tree059c5235b0974f2b8bbd2a6d5188425e882e6fd6 /src/fe-gtk/Makefile.am
parent5f7321280e2dfaa097fbd4855b547069ee96edc2 (diff)
Use a single marshal file for entire project
Diffstat (limited to 'src/fe-gtk/Makefile.am')
-rw-r--r--src/fe-gtk/Makefile.am14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am
index 07f2ffc0..4ce02dbc 100644
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -11,10 +11,10 @@ EXTRA_DIST = \
 	chanview-tree.c custom-list.h editlist.h fe-gtk.h fkeys.h gtkutil.h joind.h \
 	maingui.h menu.h notifygui.h palette.h pixmaps.h \
 	plugin-tray.h plugingui.c plugingui.h rawlog.h sexy-iso-codes.h \
-	sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h \
+	sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h \
 	../../data/hexchat.gresource.xml
 
-BUILT_SOURCES = resources.c xtext_marshalers.h xtext_marshalers.c
+BUILT_SOURCES = resources.c
 
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -29,14 +29,8 @@ endif
 hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \
 	dccgui.c editlist.c fe-gtk.c fkeys.c gtkutil.c ignoregui.c joind.c menu.c \
 	maingui.c notifygui.c palette.c pixmaps.c plugin-tray.c $(plugingui_c) \
-	rawlog.c resources.c servlistgui.c setup.c $(iso_codes_c) sexy-marshal.c \
-	sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c xtext_marshalers.c
+	rawlog.c resources.c servlistgui.c setup.c $(iso_codes_c) \
+	sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c
 
 resources.c: ../../data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=../../data --generate-dependencies ../../data/hexchat.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../../data --generate-source $<
-
-xtext_marshalers.h: xtext_marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_xtext_marshal --header $(srcdir)/xtext_marshalers.list > $@
-
-xtext_marshalers.c: xtext_marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_xtext_marshal --body $(srcdir)/xtext_marshalers.list > $@
2012-10-31 05:18:20 +0100 Make rawlog text copy behaviour consistent with the main text box' href='/git-repos/torxchat.git/commit/src/fe-gtk/rawlog.c?h=feature/fork-branding&id=78b5f5625d130d53e74bf89492e20e75583e5ce9'>78b5f562 ^
4a6ceffb ^















a51a6913 ^
4a6ceffb ^


















bc651b02 ^
4a6ceffb ^


ecdcc992 ^
78b5f562 ^





ddb3bf05 ^
78b5f562 ^




ecdcc992 ^
78b5f562 ^

4a6ceffb ^


5f732128 ^
4a6ceffb ^







95febd97 ^
4a6ceffb ^


ecdcc992 ^
4a6ceffb ^
5f732128 ^



4a6ceffb ^

5f732128 ^
51ae33cb ^
4a6ceffb ^
4a6ceffb ^
5f732128 ^


4a6ceffb ^
5f732128 ^
5567b9ab ^
4a6ceffb ^
5f732128 ^
4a6ceffb ^

78b5f562 ^


5f732128 ^
4a6ceffb ^




26cefd05 ^
4a6ceffb ^
8062bce8 ^
4a6ceffb ^



26cefd05 ^
4a6ceffb ^
26cefd05 ^
4a6ceffb ^
26cefd05 ^







05a6097d ^
26cefd05 ^

4a6ceffb ^
26cefd05 ^

4a6ceffb ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172