From 0bca3e21da57c7e7a13153c849eb92d8a342b369 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 4 Jun 2016 15:52:55 -0400 Subject: [PATCH] Even more old build tools removal. Next will be a one-fell-swoop thing. --- migrate_build/darwin/GNUfiles.mk | 61 --------------------------- migrate_build/darwin/GNUinstall.mk | 9 ---- migrate_build/darwin/GNUosspecific.mk | 20 --------- migrate_build/unix/GNUinstall.mk | 8 ---- migrate_build/unix/GNUosspecific.mk | 22 ---------- 5 files changed, 120 deletions(-) delete mode 100644 migrate_build/darwin/GNUinstall.mk delete mode 100644 migrate_build/darwin/GNUosspecific.mk delete mode 100644 migrate_build/unix/GNUinstall.mk delete mode 100644 migrate_build/unix/GNUosspecific.mk diff --git a/migrate_build/darwin/GNUfiles.mk b/migrate_build/darwin/GNUfiles.mk index 9b9ed693..48c19c7e 100644 --- a/migrate_build/darwin/GNUfiles.mk +++ b/migrate_build/darwin/GNUfiles.mk @@ -1,64 +1,3 @@ -# 28 april 2015 - -MFILES += \ - darwin/alloc.m \ - darwin/area.m \ - darwin/areaevents.m \ - darwin/autolayout.m \ - darwin/box.m \ - darwin/button.m \ - darwin/checkbox.m \ - darwin/colorbutton.m \ - darwin/combobox.m \ - darwin/control.m \ - darwin/datetimepicker.m \ - darwin/debug.m \ - darwin/draw.m \ - darwin/drawtext.m \ - darwin/editablecombo.m \ - darwin/entry.m \ - darwin/fontbutton.m \ - darwin/group.m \ - darwin/label.m \ - darwin/main.m \ - darwin/map.m \ - darwin/menu.m \ - darwin/multilineentry.m \ - darwin/progressbar.m \ - darwin/radiobuttons.m \ - darwin/scrollview.m \ - darwin/separator.m \ - darwin/slider.m \ - darwin/spinbox.m \ - darwin/stddialogs.m \ - darwin/tab.m \ - darwin/text.m \ - darwin/util.m \ - darwin/window.m - -HFILES += \ - darwin/uipriv_darwin.h - -# LONGTERM split into a separate file or put in GNUmakefile.libui somehow? - -# flags for Cocoa -LDFLAGS += $(NATIVE_UI_LDFLAGS) - -# flags for OS X versioning -CFLAGS += \ - -mmacosx-version-min=10.8 \ - -DMACOSX_DEPLOYMENT_TARGET=10.8 -CXXFLAGS += \ - -mmacosx-version-min=10.8 \ - -DMACOSX_DEPLOYMENT_TARGET=10.8 -LDFLAGS += \ - -mmacosx-version-min=10.8 - -ifeq (,$(STATIC)) -# flags for building a shared library -LDFLAGS += \ - -dynamiclib -endif # on warning about undefined symbols: # the gcc flags don't work with Apple's linker diff --git a/migrate_build/darwin/GNUinstall.mk b/migrate_build/darwin/GNUinstall.mk deleted file mode 100644 index 41df8837..00000000 --- a/migrate_build/darwin/GNUinstall.mk +++ /dev/null @@ -1,9 +0,0 @@ -ifndef PREFIX - PREFIX=/usr -endif - -# Incorrect for Mac Os X, this should be easy to fix -install: $(OUT) - cp $(OUT) $(DESTDIR)$(PREFIX)/lib/libui.0.dylib - ln -s libui.0.dylib $(DESTDIR)$(PREFIX)/lib/libui.dylib - cp ui.h ui_$(OS).h $(DESTDIR)$(PREFIX)/include/ diff --git a/migrate_build/darwin/GNUosspecific.mk b/migrate_build/darwin/GNUosspecific.mk deleted file mode 100644 index 9f948e73..00000000 --- a/migrate_build/darwin/GNUosspecific.mk +++ /dev/null @@ -1,20 +0,0 @@ -# 16 october 2015 - -EXESUFFIX = -LIBSUFFIX = .dylib -OSHSUFFIX = .h -STATICLIBSUFFIX = .a -TOOLCHAIN = gcc - -USESSONAME = 1 -SOVERSION = $(SOVERSIONA) -SONAMEEXT = .$(SOVERSION)$(LIBSUFFIX) -# note the explicit need for @rpath -# LONGTERM -current_version, -compatibility_version -SONAMEFLAG = -Wl,-install_name,@rpath/ - -NATIVE_UI_LDFLAGS += \ - -lobjc \ - -framework Foundation \ - -framework AppKit - diff --git a/migrate_build/unix/GNUinstall.mk b/migrate_build/unix/GNUinstall.mk deleted file mode 100644 index 634dbc06..00000000 --- a/migrate_build/unix/GNUinstall.mk +++ /dev/null @@ -1,8 +0,0 @@ -ifndef PREFIX - PREFIX=/usr -endif - -install: $(OUT) - cp $(OUT) $(DESTDIR)$(PREFIX)/lib/libui.so.0 - ln -fs libui.so.0 $(DESTDIR)$(PREFIX)/lib/libui.so - cp ui.h ui_$(OS).h $(DESTDIR)$(PREFIX)/include/ diff --git a/migrate_build/unix/GNUosspecific.mk b/migrate_build/unix/GNUosspecific.mk deleted file mode 100644 index 77b91fbb..00000000 --- a/migrate_build/unix/GNUosspecific.mk +++ /dev/null @@ -1,22 +0,0 @@ -# 16 october 2015 - -EXESUFFIX = -LIBSUFFIX = .so -OSHSUFFIX = .h -STATICLIBSUFFIX = .a -TOOLCHAIN = gcc - -# LONGTERM clean up all the NAMEs and SUFFIXs and NOSOSUFFIXs or whatever it was -USESSONAME = 1 -SOVERSION = $(SOVERSION0) -SONAMEEXT = $(LIBSUFFIX).$(SOVERSION) -# this is not gcc-global because OS X uses a different filename format -SONAMEFLAG = -Wl,-soname, - -NATIVE_UI_CFLAGS = \ - `pkg-config --cflags gtk+-3.0` -NATIVE_UI_CXXFLAGS = \ - `pkg-config --cflags gtk+-3.0` -NATIVE_UI_LDFLAGS = \ - `pkg-config --libs gtk+-3.0` -lm -ldl -