Re-generated the Makefiles

This commit is contained in:
Pierre Pronchery 2013-03-24 17:14:01 +01:00
parent 24a837c887
commit f85d0d05ec
3 changed files with 17 additions and 16 deletions

View File

@ -1,21 +1,21 @@
PACKAGE = Splasher PACKAGE = Splasher
VERSION = 0.0.0 VERSION = 0.0.0
SUBDIRS = data src SUBDIRS = data src
RM ?= rm -f RM = rm -f
LN ?= ln -f LN = ln -f
TAR ?= tar -czvf TAR = tar -czvf
all: subdirs all: subdirs
subdirs: subdirs:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
clean: clean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
distclean: distclean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
dist: dist:
$(RM) -r -- $(PACKAGE)-$(VERSION) $(RM) -r -- $(PACKAGE)-$(VERSION)
@ -37,9 +37,9 @@ dist:
$(RM) -- $(PACKAGE)-$(VERSION) $(RM) -- $(PACKAGE)-$(VERSION)
install: install:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
uninstall: uninstall:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
.PHONY: all subdirs clean distclean dist install uninstall .PHONY: all subdirs clean distclean dist install uninstall

View File

@ -1,8 +1,8 @@
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
MKDIR ?= mkdir -p MKDIR = mkdir -m 0755 -p
INSTALL ?= install INSTALL = install
RM ?= rm -f RM = rm -f
all: all:

View File

@ -2,17 +2,18 @@ TARGETS = ../data/Splasher.h Splasher
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
CC ?= cc SBINDIR = $(PREFIX)/sbin
CC = cc
CPPFLAGSF= -I ../include CPPFLAGSF= -I ../include
CPPFLAGS= CPPFLAGS=
CFLAGSF = -W `pkg-config --cflags libApp` CFLAGSF = -W `pkg-config --cflags libApp`
CFLAGS = -Wall -g -O2 -pedantic CFLAGS = -Wall -g -O2 -pedantic
LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic
LDFLAGS = LDFLAGS =
RM ?= rm -f RM = rm -f
LN ?= ln -f LN = ln -f
MKDIR ?= mkdir -p MKDIR = mkdir -m 0755 -p
INSTALL ?= install INSTALL = install
all: $(TARGETS) all: $(TARGETS)