all: remove useless defines

VERSION is defined in config.h, we shouldn't define or redefine it. There's no point in G_*_DEPRECATED by default other that it may break the build in future.
seriyps · Oct 23, 2015 · 3239062 · 3239062
1 parent 80d857f
commit 3239062
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
@@ -9,9 +9,7 @@ nm_l2tp_auth_dialog_CPPFLAGS =			\
 	$(GNOMEKEYRING_CFLAGS)			\
 	-DICONDIR=\""$(datadir)/pixmaps"\"	\
 	-DUIDIR=\""$(uidir)"\"			\
-	-DBINDIR=\""$(bindir)"\"		\
-	-DG_DISABLE_DEPRECATED			\
-	-DVERSION=\"$(VERSION)\"
+	-DBINDIR=\""$(bindir)"\"
 
 nm_l2tp_auth_dialog_SOURCES =			\
 	main.c \

diff --git a/properties/Makefile.am b/properties/Makefile.am
@@ -27,9 +27,7 @@ common_CFLAGS =                                         \
         $(GTK_CFLAGS)                                   \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DUIDIR=\""$(uidir)"\"                          \
-        -DLOCALEDIR=\""$(datadir)/locale"\"             \
-        -DG_DISABLE_DEPRECATED                          \
-        -DVERSION=\"$(VERSION)\"
+        -DLOCALEDIR=\""$(datadir)/locale"\"
 
 libnm_vpn_plugin_l2tp_la_CFLAGS =                       \
         $(LIBNM_CFLAGS)                                 \

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -3,11 +3,9 @@ INCLUDES = -I${top_srcdir}
 AM_CPPFLAGS =							\
 	$(GLIB_CFLAGS)                                  \
 	$(LIBNM_CFLAGS)				\
-	-DG_DISABLE_DEPRECATED					\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DNM_VERSION="\"$(VERSION)\""				\
 	-DLIBDIR=\""$(libdir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\