luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move headers to @includedir@/glib-1.2/ to allow safe coexistance with a

Browse Source 
Fri Sep  8 21:46:13 2000  Owen Taylor  <otaylor@redhat.com>

	* gmodule/Makefile.am Makefile.am glib-config.in:
	Move headers to @includedir@/glib-1.2/ to allow
	safe coexistance with a glib-2.0 build environment.
This commit is contained in:
Owen Taylor 2000-09-09 01:47:24 +00:00 committed by Owen Taylor
parent 182b22c754
commit 53cc2572f0
12 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Fri Sep 8 21:46:13 2000 Owen Taylor <otaylor@redhat.com>
* gmodule/Makefile.am Makefile.am glib-config.in:
Move headers to @includedir@/glib-1.2/ to allow
safe coexistance with a glib-2.0 build environment.
Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com> Mon Aug 21 14:39:36 2000 Owen Taylor <otaylor@redhat.com>
* glib.h: Use C99 varargs macros where possible * glib.h: Use C99 varargs macros where possible

3
Makefile.am
View File

@ -57,7 +57,8 @@ libglib_la_SOURCES = \
gtree.c \ gtree.c \
gutils.c gutils.c
include_HEADERS = \ glibincludedir=$(includedir)/glib-1.2
glibinclude_HEADERS = \
glib.h glib.h
configinclude_DATA = \ configinclude_DATA = \

5
glib-config.in
View File

@ -56,9 +56,6 @@ while test $# -gt 0; do
exit 0 exit 0
;; ;;
--cflags) --cflags)
if test "@includedir@" != /usr/include ; then
includes="-I@includedir@"
fi
echo_cflags=yes echo_cflags=yes
;; ;;
--libs) --libs)
@ -91,7 +88,7 @@ if test "$echo_cflags" = "yes"; then
if test "$lib_gthread" = "yes"; then if test "$lib_gthread" = "yes"; then
cflags="$cflags @G_THREAD_CFLAGS@" cflags="$cflags @G_THREAD_CFLAGS@"
fi fi
echo -I@libdir@/glib/include $includes $cflags echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
fi fi
if test "$echo_libs" = "yes"; then if test "$echo_libs" = "yes"; then
libsp="" libsp=""

3
glib/Makefile.am
View File

@ -57,7 +57,8 @@ libglib_la_SOURCES = \
gtree.c \ gtree.c \
gutils.c gutils.c
include_HEADERS = \ glibincludedir=$(includedir)/glib-1.2
glibinclude_HEADERS = \
glib.h glib.h
configinclude_DATA = \ configinclude_DATA = \

3
gmodule/Makefile.am
View File

@ -14,7 +14,8 @@ EXTRA_DIST = \
BUILT_SOURCES = gmoduleconf.h BUILT_SOURCES = gmoduleconf.h
gmoduleconf.h: gmoduleconf.h.in gmoduleconf.h: gmoduleconf.h.in
include_HEADERS = \ glibincludedir=$(includedir)/glib-1.2
glibinclude_HEADERS = \
gmodule.h gmodule.h
libglib = $(top_builddir)/libglib.la # -lglib libglib = $(top_builddir)/libglib.la # -lglib