Update .gitignore.

[aspectbin.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0266f3dc4e36e564ec07768e0a5c243ee9f4b687..ee9fcf4b7bc8c7fd6183226035ecb86d7177bd0a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
-DIST_SUBDIRS = examples
+DIST_SUBDIRS = . icons examples
+SUBDIRS = . icons
 
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libaspectbin.la
 
-if INST_GLADE
-glade_catalogdir = $(GLADE_catalogdir)
+if INST_GLADEUI
+glade_catalogdir = $(GLADEUI_catalogdir)
 dist_glade_catalog_DATA = aspectbin.xml
 endif
 
@@ -13,8 +14,14 @@ libaspectbin_la_CFLAGS  = $(GTK_CFLAGS)
 libaspectbin_la_LDFLAGS = $(GTK_LIBS)
 include_HEADERS = aspectbin.h
 
-if BUILD_GLADE
-libaspectbin_la_SOURCES += aspectbin-glade.c
+if BUILD_LIBGLADE
+libaspectbin_la_SOURCES += aspectbin-libglade.c
+libaspectbin_la_CFLAGS  += $(LIBGLADE_CFLAGS)
+libaspectbin_la_LDFLAGS += $(LIBGLADE_LIBS)
+endif
+
+if BUILD_GLADEUI
+libaspectbin_la_SOURCES += aspectbin-gladeui.c
 libaspectbin_la_CFLAGS  += $(GLADEUI_CFLAGS)
 libaspectbin_la_LDFLAGS += $(GLADEUI_LIBS)
 endif