diff options
| author | CEST 2000 Paolo Molaro <lupus@linuxcare.com> | 2000-06-07 16:44:29 +0000 |
|---|---|---|
| committer | Paolo Molaro <lupus@src.gnome.org> | 2000-06-07 16:44:29 +0000 |
| commit | 4bacc3ecd070f63d13fd2994595cc1b175f91f1e (patch) | |
| tree | ac68f7f9deacf66f41d30f234805eae22f41bb02 /gtk | |
| parent | 544b6cb26e036adc12a2110c82edb0574a9431b4 (diff) | |
| download | gtk+-4bacc3ecd070f63d13fd2994595cc1b175f91f1e.tar.gz | |
make it possible to configure gtk for different targets on the same
Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro <lupus@linuxcare.com>
* configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am,
gtk/Makefile.am: make it possible to configure gtk for different
targets on the same platform. The library name is now
libgtk-$target-$version.so. gtk-config accepts a --target x11|nanox|linux-fb
flag. Only the x11 target compiles right now.
* gdk/gdkregion-generic.h, gdk/gdkregion-generic.c, gdk/gdkpoly-generic.h,
gdk/gdkpolyreg-generic.c: move generic region code in the main GDK dir.
* gdk/nanox/gdk*generic*: delete generic region code.
* gdk/linux-fb/gdk*generic*: delete generic region code.
* README.nanox: update information.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d265d1d0b0..44c3d56502 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -15,25 +15,24 @@ INCLUDES = @STRIP_BEGIN@ \ @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ - @x_cflags@ \ + @more_cflags@ \ @STRIP_END@ - -# -# libraries to compile and install -# -lib_LTLIBRARIES = libgtk.la +gtarget=@gdktarget@ # libtool stuff: set version and export symbols for resolving +# since automake doesn't support conditionalized libsomething_la_LDFLAGS +# we use the general approach here libgtkincludedir = $(includedir)/gtk -libgtk_la_LDFLAGS = @STRIP_BEGIN@ \ +LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ + -rpath @prefix@/lib @PANGO_LIBS@ \ @GLIB_DEPLIBS@ \ - @x_ldflags@ \ - @x_libs@ \ + @more_ldflags@ \ + @more_libs@ \ -lm \ @STRIP_END@ # $(top_builddir)/gdk/libgdk.la @@ -382,8 +381,33 @@ gdk_headers = @STRIP_BEGIN@ \ # # setup GTK+ sources and their dependancies # -libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semipublic_h_sources) $(gtk_built_public_sources) -libgtk_la_SOURCES = $(gtk_c_sources) +all_headers = $(gtk_public_h_sources) $(gtk_semipublic_h_sources) $(gtk_built_public_sources) +all_sources = $(gtk_c_sources) + +extra = @gtktargetlib@ +if USE_X11 +libgtk_x11_includedir = $(includedir)/gtk +libgtk_x11_include_HEADERS = $(all_headers) +libgtk_x11_la_SOURCES = $(all_sources) +endif + +if USE_NANOX +libgtk_nanox_includedir = $(includedir)/gtk +libgtk_nanox_include_HEADERS = $(all_headers) +libgtk_nanox_la_SOURCES = $(all_sources) +endif + +if USE_LINUX_FB +libgtk_linux_fb_includedir = $(includedir)/gtk +libgtk_linux_fb_include_HEADERS = $(all_headers) +libgtk_linux_fb_la_SOURCES = $(all_sources) +endif + +# now define the real one to workaround automake's mishandling +lib_LTLIBRARIES = $(extra) + +EXTRA_LTLIBRARIES = libgtk-x11.la libgtk-nanox.la libgtk-linux-fb.la + MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources) EXTRA_HEADERS += EXTRA_DIST += $(gtk_private_h_sources) |