mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-20 06:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a SOURCES variable to the Makefile, replacing OBJS

Browse source 
Instead of listing objects, let's list sources. This matches also what
qmake and most other buildsystems do. The notable exception is the
kernel.

The reason that listing the sources will be interesting is because I'm
about to add rules to create the dependency files.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
This commit is contained in:
Thiago Macieira 2013-04-13 09:27:55 -07:00
parent c8b360c3b5
commit d773c02bf3
2 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Makefile
View file

@ -39,16 +39,43 @@ HEADERS = \
qt-ui/starwidget.h \ qt-ui/starwidget.h \
QTOBJS = qt-ui/maintab.o qt-ui/mainwindow.o qt-ui/plotareascene.o qt-ui/divelistview.o \ SOURCES = \
qt-ui/addcylinderdialog.o qt-ui/models.o qt-ui/starwidget.o cochran.c \
deco.c \
GTKOBJS = info-gtk.o divelist-gtk.o planner-gtk.o statistics-gtk.o device.c \
dive.c \
OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o divelist-gtk.o deco.o \ divelist.c \
planner.o planner-gtk.o \ divelist-gtk.c \
parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o uemis-downloader.o \ download-dialog.c \
qt-gui.o statistics.o file.o cochran.o device.o download-dialog.o prefs.o \ equipment.c \
webservice.o sha1.o $(RESFILE) $(QTOBJS) $(GTKOBJS) file.c \
info.c \
info-gtk.c \
libdivecomputer.c \
main.c \
parse-xml.c \
planner.c \
planner-gtk.c \
prefs.c \
print.c \
profile.c \
save-xml.c \
sha1.c \
statistics.c \
statistics-gtk.c \
time.c \
uemis.c \
uemis-downloader.c \
webservice.c \
qt-gui.cpp \
qt-ui/addcylinderdialog.cpp \
qt-ui/divelistview.cpp \
qt-ui/maintab.cpp \
qt-ui/mainwindow.cpp \
qt-ui/models.cpp \
qt-ui/plotareascene.cpp \
qt-ui/starwidget.cpp \
$(RESFILE)
ifneq ($(SQLITE3FLAGS),) ifneq ($(SQLITE3FLAGS),)
EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS) EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS)
@ -60,14 +87,14 @@ ifneq ($(strip $(LIBXSLT)),)
EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS) EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS)
endif endif
ifneq ($(strip $(LIBOSMGPSMAP)),) ifneq ($(strip $(LIBOSMGPSMAP)),)
OBJS += gps.o SOURCES += gps.c
EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS) EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS)
endif endif
ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
OBJS += linux.o SOURCES += linux.c
else ifeq ($(UNAME), darwin) else ifeq ($(UNAME), darwin)
OBJS += macos.o SOURCES += macos.c
MACOSXINSTALL = /Applications/Subsurface.app MACOSXINSTALL = /Applications/Subsurface.app
MACOSXFILES = packaging/macosx MACOSXFILES = packaging/macosx
MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
@ -75,7 +102,7 @@ else ifeq ($(UNAME), darwin)
INFOPLISTINPUT = $(INFOPLIST).in INFOPLISTINPUT = $(INFOPLIST).in
LDFLAGS += -headerpad_max_install_names -sectcreate __TEXT __info_plist $(INFOPLIST) LDFLAGS += -headerpad_max_install_names -sectcreate __TEXT __info_plist $(INFOPLIST)
else else
OBSJ += windows.o SOURCES += windows.c
WINDOWSSTAGING = ./packaging/windows WINDOWSSTAGING = ./packaging/windows
WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/')) WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
NSIINPUTFILE = $(WINDOWSSTAGING)/subsurface.nsi.in NSIINPUTFILE = $(WINDOWSSTAGING)/subsurface.nsi.in

5
Rules.mk
View file

@ -19,6 +19,11 @@ PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo))
C_SOURCES = $(filter %.c, $(SOURCES))
CXX_SOURCES = $(filter %.cpp, $(SOURCES))
OTHER_SOURCES = $(filter-out %.c %.cpp, $(SOURCES))
OBJS = $(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o) $(OTHER_SOURCES)
# Add the objects for the header files which define QObject subclasses # Add the objects for the header files which define QObject subclasses
HEADERS_NEEDING_MOC += $(shell grep -l -s 'Q_OBJECT' $(HEADERS)) HEADERS_NEEDING_MOC += $(shell grep -l -s 'Q_OBJECT' $(HEADERS))
MOC_OBJS = $(HEADERS_NEEDING_MOC:.h=.moc.o) MOC_OBJS = $(HEADERS_NEEDING_MOC:.h=.moc.o)