mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
- use GST_CFLAGS/LIBS
Original commit message from CVS: - use GST_CFLAGS/LIBS - fix ac/am errors
This commit is contained in:
parent
d1ab8f32e5
commit
91325ab7ef
9 changed files with 45 additions and 33 deletions
|
@ -202,21 +202,19 @@ noinst_HEADERS = \
|
|||
gstarch.h \
|
||||
gstpropsprivate.h
|
||||
|
||||
CFLAGS = \
|
||||
libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
|
||||
$(LIBGST_CFLAGS) \
|
||||
-D_GNU_SOURCE \
|
||||
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
|
||||
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
|
||||
\
|
||||
-W -Wpointer-arith -Wbad-function-cast \
|
||||
-Wcast-align -Wsign-compare \
|
||||
-Wmissing-prototypes -Wmissing-declarations \
|
||||
-Wnested-externs \
|
||||
-Winline -Wno-unused
|
||||
|
||||
CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" -Wall
|
||||
LIBS = $(LIBGST_LIBS)
|
||||
LDFLAGS = ""
|
||||
libgst_la_LIBADD = $(LIBGST_LIBS)
|
||||
|
||||
libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
|
||||
EXTRA_DIST = ROADMAP
|
||||
|
|
|
@ -13,7 +13,14 @@ libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
|||
libgstautoplugcache_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
libgstautoplugger_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
|
||||
libgststaticautoplug_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS)
|
||||
libgststaticautoplugrender_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS)
|
||||
libgstautoplugcache_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS)
|
||||
libgstautoplugger_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS)
|
||||
|
||||
noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h
|
||||
|
||||
noinst_PROGRAMS = autoplugtest
|
||||
|
||||
autoplugtest_CFLAGS = $(GST_CFLAGS)
|
||||
autoplugtest_LDADD = $(GST_LIBS)
|
||||
|
|
|
@ -8,8 +8,6 @@ else
|
|||
GSTHTTPSRC=
|
||||
endif
|
||||
|
||||
#CFLAGS += -O2 -Wall -finstrument-functions -DGST_ENABLE_FUNC_INSTRUMENTATION
|
||||
|
||||
libgstelements_la_DEPENDENCIES = ../libgst.la
|
||||
libgstelements_la_SOURCES = \
|
||||
gstelements.c \
|
||||
|
@ -43,8 +41,6 @@ noinst_HEADERS = \
|
|||
gstaggregator.h \
|
||||
gststatistics.h
|
||||
|
||||
CFLAGS += -O2 -Wall
|
||||
LDFLAGS += -lm
|
||||
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS)
|
||||
libgstelements_la_CFLAGS = $(GHTTP_CFLAGS) $(GST_CFLAGS)
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS) $(GST_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
|
|
|
@ -2,7 +2,10 @@ filterdir = $(libdir)/gst
|
|||
|
||||
filter_LTLIBRARIES = libgsttypes.la
|
||||
|
||||
libgsttypes_la_SOURCES = \
|
||||
gsttypes.c
|
||||
libgsttypes_la_SOURCES = gsttypes.c
|
||||
|
||||
libgsttypes_la_CFLAGS = $(XML_CFLAGS) $(GLIB_CFLAGS)
|
||||
|
||||
libgsttypes_la_LIBADD = $(XML_LIBS) $(GLIB_LIBS)
|
||||
|
||||
libgsttypes_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
|
|
|
@ -1,10 +1,3 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
# FIXME FIXME
|
||||
|
||||
LIBADD += $(GNOME_LIBS) $(GST_LIBS)
|
||||
CFLAGS += $(GNOME_CFLAGS) $(LIBGLADE_GNOME_CFLAGS) $(GST_CFLAGS) -DDATADIR=\""$(gladedir)/"\"
|
||||
|
||||
bin_PROGRAMS = gstmediaplay
|
||||
|
||||
lib_LTLIBRARIES = libgstmediaplay.la
|
||||
|
@ -35,7 +28,10 @@ noinst_HEADERS = \
|
|||
callbacks.h \
|
||||
gstplayprivate.h
|
||||
|
||||
libgstmediaplay_la_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) \
|
||||
-DDATADIR=\""$(gladedir)/"\"
|
||||
libgstmediaplay_la_LIBADD = $(GST_LIBS) $(GNOME_LIBS)
|
||||
libgstmediaplay_la_LDFLAGS = -rdynamic
|
||||
|
||||
gstmediaplay_CFLAGS = $(LIBGLADE_GNOME_CFLAGS)
|
||||
gstmediaplay_LDADD = $(GST_LIBS) $(LIBGLADE_GNOME_LIBS) libgstmediaplay.la
|
||||
gstmediaplay_CFLAGS = $(GST_CFLAGS) $(LIBGLADE_GNOME_CFLAGS) $(GNOME_CFLAGS)
|
||||
gstmediaplay_LDADD = $(GST_LIBS) $(LIBGLADE_GNOME_LIBS) $(GNOME_LIBS) libgstmediaplay.la
|
||||
|
|
|
@ -7,5 +7,5 @@ libgstaudio_la_SOURCES = gstaudio.c
|
|||
libgstaudioincludedir = $(includedir)/gst/libs/gstaudio
|
||||
libgstaudioinclude_HEADERS = gstaudio.h
|
||||
|
||||
# FIXME is this needed?
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
|
||||
libgstaudio_la_LIBADD = $(GST_LIBS)
|
||||
libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
|
||||
|
|
|
@ -7,4 +7,5 @@ libgstriff_la_SOURCES = gstriffparse.c gstriffencode.c gstriffutil.c
|
|||
libgstriffincludedir = $(includedir)/gst/libs/gstriff
|
||||
libgstriffinclude_HEADERS = gstriff.h
|
||||
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
|
||||
libgstriff_la_LIBADD = $(GST_LIBS)
|
||||
libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
|
||||
|
|
|
@ -8,8 +8,6 @@ else
|
|||
GSTHTTPSRC=
|
||||
endif
|
||||
|
||||
#CFLAGS += -O2 -Wall -finstrument-functions -DGST_ENABLE_FUNC_INSTRUMENTATION
|
||||
|
||||
libgstelements_la_DEPENDENCIES = ../libgst.la
|
||||
libgstelements_la_SOURCES = \
|
||||
gstelements.c \
|
||||
|
@ -43,8 +41,6 @@ noinst_HEADERS = \
|
|||
gstaggregator.h \
|
||||
gststatistics.h
|
||||
|
||||
CFLAGS += -O2 -Wall
|
||||
LDFLAGS += -lm
|
||||
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS)
|
||||
libgstelements_la_CFLAGS = $(GHTTP_CFLAGS) $(GST_CFLAGS)
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS) $(GST_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||
|
|
|
@ -27,7 +27,22 @@ bin_PROGRAMS = gstreamer-launch \
|
|||
man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \
|
||||
gstreamer-complete.1 gstreamer-compprep.1
|
||||
|
||||
LDADD = $(GST_LIBS)
|
||||
CFLAGS = $(LIBGST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
gstreamer_launch_LDADD = $(GST_LIBS)
|
||||
gstreamer_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
gstreamer_guilaunch_LDADD = $(GST_LIBS)
|
||||
gstreamer_guilaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
gstreamer_register_LDADD = $(GST_LIBS)
|
||||
gstreamer_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
gstreamer_inspect_LDADD = $(GST_LIBS)
|
||||
gstreamer_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
gstreamer_complete_LDADD = $(GST_LIBS)
|
||||
gstreamer_complete_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
gstreamer_compprep_LDADD = $(GST_LIBS)
|
||||
gstreamer_compprep_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
|
Loading…
Reference in a new issue