diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-21 10:43:38 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-21 10:43:38 -0500 |
| commit | a03b817aeb7fe32be881c30d50fab79455db08c5 (patch) | |
| tree | 0c3fffbd7ecd565cf1bfbf66be04e00563a3463f /Makefile.am | |
| parent | b7393636e05c95ec068e8a1ff063cbefa63a901b (diff) | |
| parent | 6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 4384054a..3934b62f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gdm-control/gdm-control \ tools/gnome-panel-control/gnome-panel-control \ - tools/obprop/obprop + tools/obxprop/obxprop dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart @@ -290,16 +290,16 @@ 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 ## +## obxprop ## -tools_obprop_obprop_CPPFLAGS = \ +tools_obxprop_obxprop_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(X_CFLAGS) -tools_obprop_obprop_LDADD = \ +tools_obxprop_obxprop_LDADD = \ $(GLIB_LIBS) \ $(X_LIBS) -tools_obprop_obprop_SOURCES = \ - tools/obprop/obprop.c +tools_obxprop_obxprop_SOURCES = \ + tools/obxprop/obxprop.c ## gdm-control ## |