Skip to content

Commit eb24cea

Browse files
author
timlinux
committed
Makefile cleanups in prepration for implementing more that one test unit
git-svn-id: http://svn.osgeo.org/qgis/trunk@5215 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 10a5bea commit eb24cea

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

tests/src/core/Makefile.am

+16-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,28 @@
1010

1111
bin_PROGRAMS = testqgsapplication
1212

13+
#
14+
# Define some global variables that will be used for building each test
15+
#
16+
17+
GLOBALLDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la
18+
GLOBALCXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../../src/core
19+
20+
#
21+
# Instruction for running the qt4 meta object compiler
22+
#
1323

1424
%.moc.cpp: %.h
1525
$(MOC) -o $@ $<
1626

27+
#
28+
# Specify the compilation files for each unit test now
29+
#
30+
1731
testqgsapplication_MOC = testqgsapplication.moc.cpp
1832
testqgsapplication_SOURCES = testqgsapplication.cpp
19-
20-
testqgsapplication_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la
21-
testqgsapplication_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../../src/core
33+
testqgsapplication_LDADD = $(GLOBALLDADD)
34+
testqgsapplication_CXXFLAGS = $(GLOBALCXXFLAGS)
2235

2336
BUILT_SOURCES = $(testqgsapplication_MOC)
2437

0 commit comments

Comments
 (0)