summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.am2
-rw-r--r--cdplayer/Makefile.am1
-rw-r--r--configure.in2
-rw-r--r--drivemount/Makefile.am3
-rw-r--r--mini-commander/src/Makefile.am2
-rw-r--r--mixer/Makefile.am3
-rw-r--r--modemlights/Makefile.am1
-rw-r--r--screenshooter/Makefile.am5
9 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 6272950ed..e64b97b28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2002-01-09 Kevin Vandersloot <kfv101@psu.edu>
+ * cdplayer/Makefile.am:
+ * drivemount/Makefile.am:
+ * mini-commander/Makefile.am:
+ * mixer/Makefile.am:
+ * modemlights/Makefile.am:
+ * multiload/Makefile.am:
+ * screenshooter/Makefile.am:
+ remove -I{includedir} as it is not needed
+
+2002-01-09 Kevin Vandersloot <kfv101@psu.edu>
+
* configure.in: version 1.90.0. Remove some cruft and only build useful
applets. Make requirements current.
diff --git a/Makefile.am b/Makefile.am
index 025c7a418..601ae9650 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,11 +51,11 @@ always_built_SUBDIRS = \
## geyes \
mini-commander \
## life \
+ charpick \
gkb-new
## whereami
## another_clock \
## asclock \
-## charpick \
## clockmail \
## drivemount \
## gnotes \
diff --git a/cdplayer/Makefile.am b/cdplayer/Makefile.am
index 4f065ca7a..fd622ecdb 100644
--- a/cdplayer/Makefile.am
+++ b/cdplayer/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES = -I. \
$(GNOME_APPLETS_CFLAGS) \
-I$(srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
--I$(includedir) \
$(GCONF_APPLETS_CFLAGS) \
$(CDROM_CFLAGS)
diff --git a/configure.in b/configure.in
index 6bfeec9e4..124dd346e 100644
--- a/configure.in
+++ b/configure.in
@@ -331,6 +331,7 @@ gkb-new/gkb/Makefile
gkb-new/xmodmap/Makefile
gkb-new/descs/Makefile
gkb-new/gkb_xmmap.in
+charpick/Makefile
])
dnl Mostly Ported Applets
@@ -372,7 +373,6 @@ dnl battery/docs/C/Makefile
dnl battery/docs/es/Makefile
dnl battery/docs/it/Makefile
dnl battery/docs/ja/Makefile
-dnl charpick/Makefile
dnl charpick/docs/Makefile
dnl charpick/docs/C/Makefile
dnl charpick/docs/es/Makefile
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 5f3febda2..55d19c21e 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -2,8 +2,7 @@
INCLUDES = \
-I. -I$(srcdir) \
$(GNOME_APPLETS_CFLAGS) \
--DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
--I$(includedir)
+-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = drivemount_applet2
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index a73bc6317..a4240dfe6 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-I. \
-I$(srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(includedir) $(GNOME_INCLUDEDIR)
+ $(GNOME_INCLUDEDIR)
bin_PROGRAMS = mini_commander_applet
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index 1d6aaac49..b385d42e1 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -2,8 +2,7 @@
INCLUDES = -I. -I$(srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(GNOME_APPLETS_CFLAGS) \
- -I$(includedir)
+ $(GNOME_APPLETS_CFLAGS)
bin_PROGRAMS = mixer_applet2
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index 80e4a7433..e40606fcf 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -3,7 +3,6 @@
INCLUDES = -I. -I$(srcdir) \
$(GNOME_APPLETS_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(includedir) \
-DVERSION=\""$(VERSION)"\"
bin_PROGRAMS = modemlights_applet2
diff --git a/screenshooter/Makefile.am b/screenshooter/Makefile.am
index 94025a8f8..2c74243e2 100644
--- a/screenshooter/Makefile.am
+++ b/screenshooter/Makefile.am
@@ -1,7 +1,6 @@
INCLUDES = -I. -I$(srcdir) \
$(GNOME_APPLETS_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(includedir)
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = screenshooter-applet2
@@ -12,7 +11,7 @@ screenshooter_applet2_SOURCES = \
window_icon.xpm
screenshooter_applet2_LDADD = \
- $(GNOME_APPLETS_LIBS) $(INTLLIBS)
+ $(GNOME_APPLETS_LIBS)
scrshotdir = $(bindir)
scrshot_SCRIPTS = update_scrshot_page