elementary/doc - Moving preview programs to their own dir.

Also added a new rule that is a dependency of docs, which will call the
widget preview programs to be built. They are not going to be built on
the general "all" rule anymore.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61593 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index e3c60fa..6b499d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -585,6 +585,7 @@ elementary.pc
 doc/elementary.dox
 doc/Makefile
 doc/Doxyfile
+doc/widgets/Makefile
 src/Makefile
 src/lib/Makefile
 src/lib/Elementary.h

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2e93544..70295b7 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,70 +6,6 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
 if EFL_BUILD_DOC
 
-AM_CPPFLAGS = \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--I$(top_srcdir)/src/bin \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
-@ELEMENTARY_EFREET_CFLAGS@ \
-@ELEMENTARY_EWEATHER_CFLAGS@ \
-@ELEMENTARY_ETHUMB_CFLAGS@ \
-@EIO_CFLAGS@
-
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
-noinst_PROGRAMS = \
-widget_preview_button1 \
-widget_preview_button2 \
-widget_preview_button3 \
-widget_preview_check1 \
-widget_preview_check2 \
-widget_preview_check3 \
-widget_preview_bubble1 \
-widget_preview_bubble2 \
-widget_preview_bubble3 \
-widget_preview_fileselector_button1 \
-widget_preview_fileselector_button2 \
-widget_preview_fileselector_button3 \
-widget_preview_colorselector \
-widget_preview_layout \
-widget_preview_conformant \
-widget_preview_index \
-widget_preview_clock \
-widget_preview_label \
-widget_preview_frame \
-widget_preview_ctxpopup \
-widget_preview_icon \
-widget_preview_image \
-widget_preview_calendar \
-widget_preview_bg \
-widget_preview_fileselector \
-widget_preview_actionslider \
-widget_preview_entry1 \
-widget_preview_entry2 \
-widget_preview_entry3 \
-widget_preview_entry4 \
-widget_preview_diskselector \
-widget_preview_fileselector_entry \
-widget_preview_flipselector \
-widget_preview_hoversel \
-widget_preview_hover \
-widget_preview_anchorview \
-widget_preview_anchorblock \
-widget_preview_flip
-
-LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
-
 # dir:file name:executable:width:height
 WGT_PREVIEW = \
        flip:preview-00.png:widget_preview_flip:100:100 \
@@ -111,7 +47,10 @@ WGT_PREVIEW = \
        anchorview:preview-00.png:widget_preview_anchorview:100:30 \
        anchorblock:preview-00.png:widget_preview_anchorblock:100:30
 
-widget-preview:
+widget-build:
+       @$(MAKE) -C widgets
+
+widget-preview: widget-build
        @for ss in $(WGT_PREVIEW); do \
                ENTRY=($${ss//:/ }) ; \
                DIR=$${ENTRY[0]} ; \
@@ -119,7 +58,7 @@ widget-preview:
                BIN=$${ENTRY[2]} ; \
                X=$${ENTRY[3]} ; \
                Y=$${ENTRY[4]} ; \
-               $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/$${DIR} $${SS} $(top_builddir)/doc/$${BIN} $${X} $${Y} ; \
+               $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/$${DIR} $${SS} $(top_builddir)/doc/widgets/$${BIN} $${X} $${Y} ; \
                mkdir -p $(top_builddir)/doc/latex/img/widget/$${DIR} ; \
                convert $(top_builddir)/doc/html/img/widget/$${DIR}/$${SS} $(top_builddir)/doc/latex/img/widget/$${DIR}/$${SS/.png/.eps} ; \
        done

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
new file mode 100644 (file)
index 0000000..df4a0c0
--- /dev/null
+++ b/doc/widgets/Makefile.am
@@ -0,0 +1,69 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+if EFL_BUILD_DOC
+
+AM_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/bin \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@ELEMENTARY_CFLAGS@ \
+@ELEMENTARY_X_CFLAGS@ \
+@ELEMENTARY_FB_CFLAGS@ \
+@ELEMENTARY_WIN32_CFLAGS@ \
+@ELEMENTARY_WINCE_CFLAGS@ \
+@ELEMENTARY_EDBUS_CFLAGS@ \
+@ELEMENTARY_EFREET_CFLAGS@ \
+@ELEMENTARY_EWEATHER_CFLAGS@ \
+@ELEMENTARY_ETHUMB_CFLAGS@ \
+@EIO_CFLAGS@
+
+if ELEMENTARY_WINDOWS_BUILD
+AM_CPPFLAGS += -DELEMENTARY_BUILD
+endif
+
+noinst_PROGRAMS = \
+widget_preview_button1 \
+widget_preview_button2 \
+widget_preview_button3 \
+widget_preview_check1 \
+widget_preview_check2 \
+widget_preview_check3 \
+widget_preview_bubble1 \
+widget_preview_bubble2 \
+widget_preview_bubble3 \
+widget_preview_fileselector_button1 \
+widget_preview_fileselector_button2 \
+widget_preview_fileselector_button3 \
+widget_preview_colorselector \
+widget_preview_layout \
+widget_preview_conformant \
+widget_preview_index \
+widget_preview_clock \
+widget_preview_label \
+widget_preview_frame \
+widget_preview_ctxpopup \
+widget_preview_icon \
+widget_preview_image \
+widget_preview_calendar \
+widget_preview_bg \
+widget_preview_fileselector \
+widget_preview_actionslider \
+widget_preview_entry1 \
+widget_preview_entry2 \
+widget_preview_entry3 \
+widget_preview_entry4 \
+widget_preview_diskselector \
+widget_preview_fileselector_entry \
+widget_preview_flipselector \
+widget_preview_hoversel \
+widget_preview_hover \
+widget_preview_anchorview \
+widget_preview_anchorblock \
+widget_preview_flip
+
+LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
+
+endif

diff --git a/doc/widget_preview_actionslider.c b/doc/widgets/widget_preview_actionslider.c
similarity index 100%
rename from doc/widget_preview_actionslider.c
rename to doc/widgets/widget_preview_actionslider.c

diff --git a/doc/widget_preview_anchorblock.c b/doc/widgets/widget_preview_anchorblock.c
similarity index 100%
rename from doc/widget_preview_anchorblock.c
rename to doc/widgets/widget_preview_anchorblock.c

diff --git a/doc/widget_preview_anchorview.c b/doc/widgets/widget_preview_anchorview.c
similarity index 100%
rename from doc/widget_preview_anchorview.c
rename to doc/widgets/widget_preview_anchorview.c

diff --git a/doc/widget_preview_bg.c b/doc/widgets/widget_preview_bg.c
similarity index 100%
rename from doc/widget_preview_bg.c
rename to doc/widgets/widget_preview_bg.c

diff --git a/doc/widget_preview_bubble1.c b/doc/widgets/widget_preview_bubble1.c
similarity index 100%
rename from doc/widget_preview_bubble1.c
rename to doc/widgets/widget_preview_bubble1.c

diff --git a/doc/widget_preview_bubble2.c b/doc/widgets/widget_preview_bubble2.c
similarity index 100%
rename from doc/widget_preview_bubble2.c
rename to doc/widgets/widget_preview_bubble2.c

diff --git a/doc/widget_preview_bubble3.c b/doc/widgets/widget_preview_bubble3.c
similarity index 100%
rename from doc/widget_preview_bubble3.c
rename to doc/widgets/widget_preview_bubble3.c

diff --git a/doc/widget_preview_button1.c b/doc/widgets/widget_preview_button1.c
similarity index 100%
rename from doc/widget_preview_button1.c
rename to doc/widgets/widget_preview_button1.c

diff --git a/doc/widget_preview_button2.c b/doc/widgets/widget_preview_button2.c
similarity index 100%
rename from doc/widget_preview_button2.c
rename to doc/widgets/widget_preview_button2.c

diff --git a/doc/widget_preview_button3.c b/doc/widgets/widget_preview_button3.c
similarity index 100%
rename from doc/widget_preview_button3.c
rename to doc/widgets/widget_preview_button3.c

diff --git a/doc/widget_preview_calendar.c b/doc/widgets/widget_preview_calendar.c
similarity index 100%
rename from doc/widget_preview_calendar.c
rename to doc/widgets/widget_preview_calendar.c

diff --git a/doc/widget_preview_check1.c b/doc/widgets/widget_preview_check1.c
similarity index 100%
rename from doc/widget_preview_check1.c
rename to doc/widgets/widget_preview_check1.c

diff --git a/doc/widget_preview_check2.c b/doc/widgets/widget_preview_check2.c
similarity index 100%
rename from doc/widget_preview_check2.c
rename to doc/widgets/widget_preview_check2.c

diff --git a/doc/widget_preview_check3.c b/doc/widgets/widget_preview_check3.c
similarity index 100%
rename from doc/widget_preview_check3.c
rename to doc/widgets/widget_preview_check3.c

diff --git a/doc/widget_preview_clock.c b/doc/widgets/widget_preview_clock.c
similarity index 100%
rename from doc/widget_preview_clock.c
rename to doc/widgets/widget_preview_clock.c

diff --git a/doc/widget_preview_colorselector.c b/doc/widgets/widget_preview_colorselector.c
similarity index 100%
rename from doc/widget_preview_colorselector.c
rename to doc/widgets/widget_preview_colorselector.c

diff --git a/doc/widget_preview_conformant.c b/doc/widgets/widget_preview_conformant.c
similarity index 100%
rename from doc/widget_preview_conformant.c
rename to doc/widgets/widget_preview_conformant.c

diff --git a/doc/widget_preview_ctxpopup.c b/doc/widgets/widget_preview_ctxpopup.c
similarity index 100%
rename from doc/widget_preview_ctxpopup.c
rename to doc/widgets/widget_preview_ctxpopup.c

diff --git a/doc/widget_preview_diskselector.c b/doc/widgets/widget_preview_diskselector.c
similarity index 100%
rename from doc/widget_preview_diskselector.c
rename to doc/widgets/widget_preview_diskselector.c

diff --git a/doc/widget_preview_entry1.c b/doc/widgets/widget_preview_entry1.c
similarity index 100%
rename from doc/widget_preview_entry1.c
rename to doc/widgets/widget_preview_entry1.c

diff --git a/doc/widget_preview_entry2.c b/doc/widgets/widget_preview_entry2.c
similarity index 100%
rename from doc/widget_preview_entry2.c
rename to doc/widgets/widget_preview_entry2.c

diff --git a/doc/widget_preview_entry3.c b/doc/widgets/widget_preview_entry3.c
similarity index 100%
rename from doc/widget_preview_entry3.c
rename to doc/widgets/widget_preview_entry3.c

diff --git a/doc/widget_preview_entry4.c b/doc/widgets/widget_preview_entry4.c
similarity index 100%
rename from doc/widget_preview_entry4.c
rename to doc/widgets/widget_preview_entry4.c

diff --git a/doc/widget_preview_fileselector.c b/doc/widgets/widget_preview_fileselector.c
similarity index 100%
rename from doc/widget_preview_fileselector.c
rename to doc/widgets/widget_preview_fileselector.c

diff --git a/doc/widget_preview_fileselector_button1.c b/doc/widgets/widget_preview_fileselector_button1.c
similarity index 100%
rename from doc/widget_preview_fileselector_button1.c
rename to doc/widgets/widget_preview_fileselector_button1.c

diff --git a/doc/widget_preview_fileselector_button2.c b/doc/widgets/widget_preview_fileselector_button2.c
similarity index 100%
rename from doc/widget_preview_fileselector_button2.c
rename to doc/widgets/widget_preview_fileselector_button2.c

diff --git a/doc/widget_preview_fileselector_button3.c b/doc/widgets/widget_preview_fileselector_button3.c
similarity index 100%
rename from doc/widget_preview_fileselector_button3.c
rename to doc/widgets/widget_preview_fileselector_button3.c

diff --git a/doc/widget_preview_fileselector_entry.c b/doc/widgets/widget_preview_fileselector_entry.c
similarity index 100%
rename from doc/widget_preview_fileselector_entry.c
rename to doc/widgets/widget_preview_fileselector_entry.c

diff --git a/doc/widget_preview_flip.c b/doc/widgets/widget_preview_flip.c
similarity index 100%
rename from doc/widget_preview_flip.c
rename to doc/widgets/widget_preview_flip.c

diff --git a/doc/widget_preview_flipselector.c b/doc/widgets/widget_preview_flipselector.c
similarity index 100%
rename from doc/widget_preview_flipselector.c
rename to doc/widgets/widget_preview_flipselector.c

diff --git a/doc/widget_preview_frame.c b/doc/widgets/widget_preview_frame.c
similarity index 100%
rename from doc/widget_preview_frame.c
rename to doc/widgets/widget_preview_frame.c

diff --git a/doc/widget_preview_hover.c b/doc/widgets/widget_preview_hover.c
similarity index 100%
rename from doc/widget_preview_hover.c
rename to doc/widgets/widget_preview_hover.c

diff --git a/doc/widget_preview_hoversel.c b/doc/widgets/widget_preview_hoversel.c
similarity index 100%
rename from doc/widget_preview_hoversel.c
rename to doc/widgets/widget_preview_hoversel.c

diff --git a/doc/widget_preview_icon.c b/doc/widgets/widget_preview_icon.c
similarity index 100%
rename from doc/widget_preview_icon.c
rename to doc/widgets/widget_preview_icon.c

diff --git a/doc/widget_preview_image.c b/doc/widgets/widget_preview_image.c
similarity index 100%
rename from doc/widget_preview_image.c
rename to doc/widgets/widget_preview_image.c

diff --git a/doc/widget_preview_index.c b/doc/widgets/widget_preview_index.c
similarity index 100%
rename from doc/widget_preview_index.c
rename to doc/widgets/widget_preview_index.c

diff --git a/doc/widget_preview_label.c b/doc/widgets/widget_preview_label.c
similarity index 100%
rename from doc/widget_preview_label.c
rename to doc/widgets/widget_preview_label.c

diff --git a/doc/widget_preview_layout.c b/doc/widgets/widget_preview_layout.c
similarity index 100%
rename from doc/widget_preview_layout.c
rename to doc/widgets/widget_preview_layout.c

diff --git a/doc/widget_preview_tmpl_foot.c b/doc/widgets/widget_preview_tmpl_foot.c
similarity index 100%
rename from doc/widget_preview_tmpl_foot.c
rename to doc/widgets/widget_preview_tmpl_foot.c

diff --git a/doc/widget_preview_tmpl_head.c b/doc/widgets/widget_preview_tmpl_head.c
similarity index 100%
rename from doc/widget_preview_tmpl_head.c
rename to doc/widgets/widget_preview_tmpl_head.c