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 /gdk/x11 | |
| 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 'gdk/x11')
| -rw-r--r-- | gdk/x11/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 2cd04c1dd3..1e8e1ad103 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -22,6 +22,7 @@ LDADDS = @STRIP_BEGIN@ \ -lm \ @STRIP_END@ +if USE_X11 noinst_LTLIBRARIES = libgdk-x11.la if XINPUT_GXI @@ -58,10 +59,6 @@ libgdk_x11_la_SOURCES = \ gdkpango-x11.c \ gdkpixmap-x11.c \ gdkproperty-x11.c \ - gdkpoly-generic.h \ - gdkpolyreg-generic.c \ - gdkregion-generic.h \ - gdkregion-generic.c \ gdkselection-x11.c \ gdkvisual-x11.c \ gdkwindow-x11.c \ @@ -83,6 +80,8 @@ bin_PROGRAMS = @xinput_progs@ gxid_SOURCES = gxid.c gxid_LDADD = $(LDADDS) +endif + install-data-local: ../../$(MKINSTALLDIRS) $(includedir)/gdk $(INSTALL_DATA) $(srcdir)/gdkx.h $(includedir)/gdk |