summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-03-19 19:25:57 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2014-03-19 19:25:57 +0100
commited54ecfc42371545ea438c21ba4d736cdd6f15ff (patch)
treed3d336770c9cd95c405067466e09d636abb0bd31
parentd6f325454d47546d56525cf64c528f35f8dec430 (diff)
Clean up more of the dist files mess.
-rw-r--r--dgedit/Makefile.am30
1 files changed, 16 insertions, 14 deletions
diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am
index 09bfe22..2925f74 100644
--- a/dgedit/Makefile.am
+++ b/dgedit/Makefile.am
@@ -5,8 +5,8 @@ if HAVE_EDITOR
bin_PROGRAMS = dgedit
-dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(shell ../tools/MocList o ) \
- $(AO_LIBS)
+dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(AO_LIBS) \
+ $(shell ../tools/MocList o ) qrc_dgedit.o
dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS)
AM_CXXFLAGS = $(QT_CFLAGS)
@@ -23,8 +23,7 @@ dgedit_SOURCES = \
itemeditor.cc \
mainwindow.cc \
mipmap.cc \
- samplesorter.cc \
- dgedit.qrc
+ samplesorter.cc
EXTRA_DIST = \
audioextractor.h \
@@ -38,25 +37,28 @@ EXTRA_DIST = \
mainwindow.h \
mipmap.h \
samplesorter.h \
- selection.h
+ selection.h \
+ dgedit.qrc
dgedit_MOC = $(shell ../tools/MocList cc )
-dgedit_qrc.cpp: dgedit.qrc
- rcc $< > $@
-
-BUILT_SOURCES = $(dgedit_MOC) dgedit_qrc.cpp
+BUILT_SOURCES = $(dgedit_MOC) qrc_dgedit.cc
CLEANFILES = $(BUILT_SOURCES)
+qrc_%.cc: %.qrc
+ rcc $< > $@
+
%.moc.cc: %.h
$(QT_MOC) -o $@ $<
-%.h: %.ui
- $(QT_UIC) -o $@ $<
-
-%.cc: %.ui
- $(QT_UIC) -o $@ -impl $*.h $<
+#
+# ui files not used in this project...
+#%.h: %.ui
+# $(QT_UIC) -o $@ $<
+#
+#%.cc: %.ui
+# $(QT_UIC) -o $@ -impl $*.h $<
# command for creating .res file from .rc on Win32
%.res: %.rc