diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2014-03-07 04:26:03 +0100 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2014-03-07 04:26:03 +0100 |
| commit | d6f325454d47546d56525cf64c528f35f8dec430 (patch) | |
| tree | e1353daf91d5db3b6db36529222ff1fbc38f904b /dgedit | |
| parent | 74b8a63270c1c0b01b33e861c26b1e2a59eeb82b (diff) | |
| parent | 94ae7f27812b3de5bd1046b758f5bb95eacc59be (diff) | |
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
Diffstat (limited to 'dgedit')
| -rw-r--r-- | dgedit/Makefile.am | 8 | ||||
| -rw-r--r-- | dgedit/icons/Makefile.am | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am index 2ebd304..09bfe22 100644 --- a/dgedit/Makefile.am +++ b/dgedit/Makefile.am @@ -1,3 +1,6 @@ +SUBDIRS = icons +DISTDIRS = icons + if HAVE_EDITOR bin_PROGRAMS = dgedit @@ -8,7 +11,7 @@ dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(shell ../tools/MocList o ) \ dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS) AM_CXXFLAGS = $(QT_CFLAGS) -dgedit_SOURCES = $(shell ../tools/MocList cc ) \ +dgedit_SOURCES = \ dgedit.cc \ audioextractor.cc \ canvas.cc \ @@ -21,8 +24,7 @@ dgedit_SOURCES = $(shell ../tools/MocList cc ) \ mainwindow.cc \ mipmap.cc \ samplesorter.cc \ - dgedit.qrc \ - dgedit_qrc.cpp + dgedit.qrc EXTRA_DIST = \ audioextractor.h \ diff --git a/dgedit/icons/Makefile.am b/dgedit/icons/Makefile.am new file mode 100644 index 0000000..b838804 --- /dev/null +++ b/dgedit/icons/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ + file.png \ + master.png
\ No newline at end of file |