diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-14 15:25:57 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-14 15:25:57 -0500 |
| commit | a93b00a5e93281c7c2c31112f0b6b827d605a19d (patch) | |
| tree | 92c786a617a3dc755c633eeb8c5410407a258fbf /Makefile.am | |
| parent | acafa38c8ea210b12ed92fc16281b915ab61542c (diff) | |
| parent | f3e553446fdcfc04f26ea25396a138965c4a999d (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 786b97b0..4384054a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,8 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ tools/gdm-control/gdm-control \ - tools/gnome-panel-control/gnome-panel-control + tools/gnome-panel-control/gnome-panel-control \ + tools/obprop/obprop dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart @@ -289,6 +290,17 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## obprop ## + +tools_obprop_obprop_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(X_CFLAGS) +tools_obprop_obprop_LDADD = \ + $(GLIB_LIBS) \ + $(X_LIBS) +tools_obprop_obprop_SOURCES = \ + tools/obprop/obprop.c + ## gdm-control ## tools_gdm_control_gdm_control_CPPFLAGS = \ |