]>
Commit | Line | Data |
---|---|---|
1b729160 PG |
1 | --- ./gobobjs/Makefile.am.org Sun Oct 7 16:28:14 2001 |
2 | +++ ./gobobjs/Makefile.am Sun Oct 7 16:32:54 2001 | |
3 | @@ -29,7 +29,8 @@ | |
4 | geledit-mdi-child-private.h \ | |
5 | drgeo-mdi-child-private.h | |
6 | ||
7 | -base_libgobobjs_a_SOURCES = \ | |
8 | +libgobobjs_a_SOURCES = \ | |
9 | + $(GOB_SRCLIST) \ | |
10 | drgenius-mdi-child.gob \ | |
11 | geledit-mdi-child.gob \ | |
12 | console-mdi-child.gob \ | |
13 | @@ -38,13 +39,10 @@ | |
14 | ||
15 | ||
16 | ||
17 | -libgobobjs_a_SOURCES = \ | |
18 | - $(GOB_SRCLIST) \ | |
19 | - $(base_libgobobjs_a_SOURCES) | |
20 | ||
21 | BUILT_SOURCES = $(GOB_SRCLIST) | |
22 | ||
23 | -CLEANFILES += *~ core $(BUILT_SOURCES) | |
24 | +CLEANFILES = *~ core $(BUILT_SOURCES) | |
25 | ||
26 | %.c %.h %-private.h: %.gob | |
27 | @GOB@ $< | |
28 | --- ./drgeo/Makefile.am.org Sun Oct 7 16:26:13 2001 | |
29 | +++ ./drgeo/Makefile.am Sun Oct 7 16:27:18 2001 | |
30 | @@ -1,6 +1,6 @@ | |
31 | gladedir = $(datadir)/drgenius/glade | |
32 | ||
33 | -YFLAGS += -d -t | |
34 | +YFLAGS = -d -t | |
35 | CFLAGS += @GNOME_SUPPORT@ -DLIBRARY_DIR=\""$(datadir)/drgeo/"\" \ | |
36 | -DDRGENIUS_GLADEDIR=\""$(gladedir)"\" | |
37 | override CXXFLAGS += @GNOME_SUPPORT@ -DLIBRARY_DIR=\""$(datadir)/drgeo/"\" \ | |
38 | @@ -58,7 +58,7 @@ | |
39 | drgeo_locus.h drgeo_locus.cc \ | |
40 | drgeo_command.h drgeo_command.cc | |
41 | ||
42 | -CLEANFILES += $(BUILT_SOURCES) | |
43 | +CLEANFILES = $(BUILT_SOURCES) | |
44 | ||
45 | EXTRA_DIST = DevelopersFAQ TODO README msgDrGeoGUI msgDrGeniusGUI | |
46 | ||
47 | --- ./genius/Makefile.am.org Sun Oct 7 16:27:31 2001 | |
48 | +++ ./genius/Makefile.am Sun Oct 7 16:27:52 2001 | |
49 | @@ -7,7 +7,7 @@ | |
50 | plugin_includedir = $(includedir)/genius | |
51 | ||
52 | #YACCFLAGS += -d -t | |
53 | -YFLAGS += -d -t | |
54 | +YFLAGS = -d -t | |
55 | CFLAGS += @GNOME_SUPPORT@ -DLIBRARY_DIR=\""$(datadir)/genius/"\" \ | |
56 | -Wno-uninitialized | |
57 | ||
58 | @@ -215,7 +215,7 @@ | |
59 | ||
60 | BUILT_SOURCES = parse.h parse.c lexer.c | |
61 | ||
62 | -CLEANFILES += $(BUILT_SOURCES) | |
63 | +CLEANFILES = $(BUILT_SOURCES) | |
64 | ||
65 | EXTRA_DIST = geniustest.pl geniustests.txt gnome-genius.desktop test.plugin.in #lib.gel | |
66 | ||
67 | --- ./Makefile.am.org Sun Oct 7 16:25:34 2001 | |
68 | +++ ./Makefile.am Sun Oct 7 16:26:00 2001 | |
69 | @@ -56,7 +56,7 @@ | |
70 | drgenius.spec.in readline-4.0.patch drgenius.desktop \ | |
71 | $(appicon_DATA) | |
72 | ||
73 | -CLEANFILES += *~ core | |
74 | +CLEANFILES = *~ core | |
75 | ||
76 | appicondir = $(datadir)/pixmaps | |
77 | appicon_DATA = gnome-drgenius.png gnome-drgenius-geo.png \ |