diff options
| -rw-r--r-- | packages/gnome1/Makefile | 114 | ||||
| -rw-r--r-- | packages/gnome1/Makefile.fpc | 2 |
2 files changed, 114 insertions, 2 deletions
diff --git a/packages/gnome1/Makefile b/packages/gnome1/Makefile index 12b466d289..0bb65756c6 100644 --- a/packages/gnome1/Makefile +++ b/packages/gnome1/Makefile @@ -1498,291 +1498,377 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl gtk1 +override REQUIRE_PACKAGES=rtl gtk1 imlib ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1888,6 +1974,32 @@ ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif endif +ifdef REQUIRE_PACKAGES_IMLIB +PACKAGEDIR_IMLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /imlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_IMLIB),) +ifneq ($(wildcard $(PACKAGEDIR_IMLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_IMLIB=$(PACKAGEDIR_IMLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_IMLIB=$(PACKAGEDIR_IMLIB) +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_IMLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_IMLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_IMLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_IMLIB= +UNITDIR_IMLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /imlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_IMLIB),) +UNITDIR_IMLIB:=$(firstword $(UNITDIR_IMLIB)) +else +UNITDIR_IMLIB= +endif +endif +ifdef UNITDIR_IMLIB +override COMPILER_UNITDIR+=$(UNITDIR_IMLIB) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(CPU_TARGET) endif diff --git a/packages/gnome1/Makefile.fpc b/packages/gnome1/Makefile.fpc index eca2e4c2c7..32c47dd254 100644 --- a/packages/gnome1/Makefile.fpc +++ b/packages/gnome1/Makefile.fpc @@ -8,7 +8,7 @@ version=1.0.0 [require] libc=y -packages=gtk1 +packages=gtk1 imlib [target] units=libgnomeui libzvt libart libgnome gconfclient gconf |