diff options
| author | Manolo Gouy <Manolo> | 2016-08-12 16:59:06 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-08-12 16:59:06 +0000 |
| commit | 3932b1af7c8c36b7b69242e9904c2f54ae4ed0cd (patch) | |
| tree | 717d120c4a08339259286698abc3893c50f22a85 /src/Makefile | |
| parent | 765919244741b7e768986e46eaed1119fae3af17 (diff) | |
Remove uses of the '$(shell if test ...' syntax from Makefile that is not cross-platform
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11872 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index 5684a85aa..271ce867d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -309,20 +309,39 @@ PSCPPFILES = \ FLTKFLAGS = -DFL_LIBRARY include ../makeinclude -MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi) +# makeinclude has set this variable: +# BUILD = {WIN|X11|XFT|OSX} + +#MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi) +MMFILES_OSX = $(OBJCPPFILES) +MMFILES = $(MMFILES_$(BUILD)) + CPPFILES += $(PSCPPFILES) -CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi) +#CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi) +CPPFILES_OSX = $(QUARTZCPPFILES) + +#CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi) +#CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) = Yes; then echo $(XLIBXFTFILES); fi) +CPPFILES_XFT = $(XLIBCPPFILES) $(XLIBXFTFILES) +#CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBFONTFILES); fi) +CPPFILES_X11 = $(XLIBCPPFILES) $(XLIBFONTFILES) + +#CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi) +CPPFILES_WIN = $(GDICPPFILES) + +CPPFILES += $(CPPFILES_$(BUILD)) + -CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi) -CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) = Yes; then echo $(XLIBXFTFILES); fi) -CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBFONTFILES); fi) +#CFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCFILES); fi) +#CFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBXCFILES); fi) +CFILES_X11 = $(XLIBCFILES) $(XLIBXCFILES) +CFILES_XFT = $(XLIBCFILES) -CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi) +#CFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICFILES); fi) +CFILES_WIN = $(GDICFILES) -CFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCFILES); fi) -CFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBXCFILES); fi) +CFILES += $(CFILES_$(BUILD)) -CFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICFILES); fi) OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o) GLOBJECTS = $(GLCPPFILES:.cxx=.o) |